From 366d0ee371ac6fc00617324c122e058dc8e5bea3 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Wed, 5 Jun 2019 09:56:13 +0300 Subject: print usage and exit with error on invalid arguments Add also some testing to make sure help, long help and handling of invalid arguments works as expected. Based on pull request #19 originally by Laurent Arnoud (@spk). --- src/apk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/apk.c b/src/apk.c index 069f4c0..626da6d 100644 --- a/src/apk.c +++ b/src/apk.c @@ -588,11 +588,11 @@ int main(int argc, char **argv) help_requested = 1; break; } - if (r != -ENOTSUP) goto err_and_usage; + if (r != -ENOTSUP) goto err; } } - if (help_requested) { + if (help_requested || r == -ENOTSUP) { r = usage(applet); goto err; } @@ -686,12 +686,9 @@ int main(int argc, char **argv) r = 0; #endif -err_and_usage: - if (r == -EINVAL) - r = usage(applet); +err: if (r == -ESHUTDOWN) r = 0; -err: if (ctx) free(ctx); -- cgit v1.2.3-60-g2f50