From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCf86-00014Q-3I 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-00032d-5L for qemu-devel@nongnu.org; Tue, 27 Mar 2012 18:44:41 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:39725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCf82-00031z-Vs for qemu-devel@nongnu.org; Tue, 27 Mar 2012 18:44:39 -0400 From: Meador Inge Date: Tue, 27 Mar 2012 17:44:30 -0500 Message-ID: <1332888271-7083-4-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 3/4] linux-user: Add proper error messages for bad options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi This patch adds better support for diagnosing option parser errors. The previous implementation just printed the usage text and exited when a bad option or argument was found. This made it very difficult to determine why the usage was being displayed and it was doubly confusing for cases like '--help' (it wasn't clear that --help was actually an error). Signed-off-by: Meador Inge --- linux-user/main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 570178a..9616d8e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3245,7 +3245,9 @@ static int parse_args(int argc, char **argv) if (!strcmp(r, arginfo->argv)) { if (arginfo->has_arg) { if (optind >= argc) { - usage(1); + (void) fprintf(stderr, + "qemu: missing argument for option '%s'\n", r); + exit(1); } arginfo->handle_opt(argv[optind]); optind++; @@ -3258,12 +3260,14 @@ static int parse_args(int argc, char **argv) /* no option matched the current argv */ if (arginfo->handle_opt == NULL) { - usage(1); + (void) fprintf(stderr, "qemu: unknown option '%s'\n", r); + exit(1); } } if (optind >= argc) { - usage(1); + (void) fprintf(stderr, "qemu: invalid option '%s'\n", r); + exit(1); } filename = argv[optind]; -- 1.7.7.6