From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCAkF-0006sf-7a for qemu-devel@nongnu.org; Mon, 06 Jul 2015 14:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCAkA-0003M3-Mn for qemu-devel@nongnu.org; Mon, 06 Jul 2015 14:03:55 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:58013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCAkA-0003L0-HS for qemu-devel@nongnu.org; Mon, 06 Jul 2015 14:03:50 -0400 From: Date: Mon, 6 Jul 2015 11:03:38 -0700 Message-ID: <1436205821-20320-2-git-send-email-meadori@codesourcery.com> In-Reply-To: <1436205821-20320-1-git-send-email-meadori@codesourcery.com> References: <1436205821-20320-1-git-send-email-meadori@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 1/4] linux-user: Exit 0 when -h is used List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, Meador Inge From: Meador Inge Signed-off-by: Meador Inge --- linux-user/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index c855bcc..c6ab557 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -65,7 +65,7 @@ unsigned long reserved_va; #endif #endif -static void usage(void); +static void usage(int exitcode); static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; const char *qemu_uname_release; @@ -3473,7 +3473,7 @@ CPUArchState *cpu_copy(CPUArchState *env) static void handle_arg_help(const char *arg) { - usage(); + usage(0); } static void handle_arg_log(const char *arg) @@ -3499,7 +3499,7 @@ static void handle_arg_set_env(const char *arg) r = p = strdup(arg); while ((token = strsep(&p, ",")) != NULL) { if (envlist_setenv(envlist, token) != 0) { - usage(); + usage(1); } } free(r); @@ -3511,7 +3511,7 @@ static void handle_arg_unset_env(const char *arg) r = p = strdup(arg); while ((token = strsep(&p, ",")) != NULL) { if (envlist_unsetenv(envlist, token) != 0) { - usage(); + usage(1); } } free(r); @@ -3527,7 +3527,7 @@ static void handle_arg_stack_size(const char *arg) char *p; guest_stack_size = strtoul(arg, &p, 0); if (guest_stack_size == 0) { - usage(); + usage(1); } if (*p == 'M') { @@ -3698,7 +3698,7 @@ static const struct qemu_argument arg_table[] = { {NULL, NULL, false, NULL, NULL, NULL} }; -static void usage(void) +static void usage(int exitcode) { const struct qemu_argument *arginfo; int maxarglen; @@ -3765,7 +3765,7 @@ static void usage(void) "Note that if you provide several changes to a single variable\n" "the last change will stay in effect.\n"); - exit(1); + exit(exitcode); } static int parse_args(int argc, char **argv) @@ -3804,7 +3804,7 @@ static int parse_args(int argc, char **argv) if (!strcmp(r, arginfo->argv)) { if (arginfo->has_arg) { if (optind >= argc) { - usage(); + usage(1); } arginfo->handle_opt(argv[optind]); optind++; @@ -3817,12 +3817,12 @@ static int parse_args(int argc, char **argv) /* no option matched the current argv */ if (arginfo->handle_opt == NULL) { - usage(); + usage(1); } } if (optind >= argc) { - usage(); + usage(1); } filename = argv[optind]; -- 1.8.1.1