From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCf86-00015J-Es for qemu-devel@nongnu.org; Tue, 27 Mar 2012 18:44:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCf83-00032c-5L for qemu-devel@nongnu.org; Tue, 27 Mar 2012 18:44:42 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:39719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCf82-00031j-Vy for qemu-devel@nongnu.org; Tue, 27 Mar 2012 18:44:39 -0400 From: Meador Inge Date: Tue, 27 Mar 2012 17:44:28 -0500 Message-ID: <1332888271-7083-2-git-send-email-meadori@codesourcery.com> In-Reply-To: <1332888271-7083-1-git-send-email-meadori@codesourcery.com> References: <1332888271-7083-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 Signed-off-by: Meador Inge --- linux-user/main.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 962677e..aabce83 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -51,7 +51,7 @@ int have_guest_base; unsigned long reserved_va; #endif -static void usage(void); +static void usage(int exitcode); static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; const char *qemu_uname_release = CONFIG_UNAME_RELEASE; @@ -2926,7 +2926,7 @@ void init_task_state(TaskState *ts) static void handle_arg_help(const char *arg) { - usage(); + usage(0); } static void handle_arg_log(const char *arg) @@ -2956,7 +2956,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); @@ -2968,7 +2968,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); @@ -2984,7 +2984,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') { @@ -3143,7 +3143,7 @@ struct qemu_argument arg_table[] = { {NULL, NULL, false, NULL, NULL, NULL} }; -static void usage(void) +static void usage(int exitcode) { struct qemu_argument *arginfo; int maxarglen; @@ -3204,7 +3204,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) @@ -3243,7 +3243,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++; @@ -3256,12 +3256,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.7.7.6