[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/13] linux-user: Exit 0 when -h is used
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 01/13] linux-user: Exit 0 when -h is used |
Date: |
Fri, 2 Oct 2015 16:00:53 +0300 |
From: Meador Inge <address@hidden>
Signed-off-by: Meador Inge <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
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 25cf875..7593212 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -63,7 +63,7 @@ unsigned long reserved_va = 0xf7000000;
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;
@@ -3700,7 +3700,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)
@@ -3726,7 +3726,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);
@@ -3738,7 +3738,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);
@@ -3754,7 +3754,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') {
@@ -3921,7 +3921,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;
@@ -3988,7 +3988,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)
@@ -4027,7 +4027,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++;
@@ -4040,12 +4040,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];
--
2.5.3
- [Qemu-devel] [PULL 00/13] linux-user queque, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 10/13] linux-user: add name_to_handle_at/open_by_handle_at, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 09/13] linux-user: Return target error number in do_fork(), riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 11/13] linux-user/syscall.c: Add EAGAIN to host_to_target_errno_table for, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 12/13] linux-user/signal.c: Use setup_rt_frame() instead of setup_frame() for target openrisc, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 05/13] linux-user: Treat --foo options the same as -foo, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 13/13] linux-user: assert that target_mprotect cannot fail, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 01/13] linux-user: Exit 0 when -h is used,
riku . voipio <=
- Re: [Qemu-devel] [PULL 00/13] linux-user queque, Peter Maydell, 2015/10/08
- [Qemu-devel] [PULL 02/13] linux-user: Add -help, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 03/13] linux-user: Add proper error messages for bad options, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 07/13] linux-user: remove MAX_ARG_PAGES limit, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 08/13] linux-user: fix cmsg conversion in case of multiple headers, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 06/13] linux-user: remove unused image_info members, riku . voipio, 2015/10/08
- [Qemu-devel] [PULL 04/13] linux-user: use EXIT_SUCCESS and EXIT_FAILURE, riku . voipio, 2015/10/08