From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 73303 invoked by alias); 11 Dec 2019 14:24:55 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 73285 invoked by uid 89); 11 Dec 2019 14:24:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,LIKELY_SPAM_BODY,SPF_PASS autolearn=ham version=3.3.1 spammy= X-Spam-Status: No, score=-24.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,LIKELY_SPAM_BODY,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed] Add --help option in usage Message-ID: <20191211142449.GA2993@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-SW-Source: 2019-q4/txt/msg00145.txt.bz2 Hi, The option -? (short for --help) shows the usage, but is itself not listed in the usage: ... $ dwz -? dwz: Usage: dwz [-v] [-q] [-l ] [-L ] [-h] [-m COMMONFILE] \ [-M NAME | -r] [FILES] dwz [-v] [-q] [-l ] [-L ] -o OUTFILE FILE ... Furthermore, the -v option is listed as common option, but like -?, stops regular processing after printing a message. List these two together in a new usage line, and show them as exclusive to indicate that only one can have effect: ... dwz [-q] [-l ] [-L ] [-h] [-m COMMONFILE] \ [-M NAME | -r] [FILES] dwz [-q] [-l ] [-L ] -o OUTFILE FILE dwz [ -v | -? ] ... Committed to trunk. Thanks, - Tom Add --help option in usage 2019-12-11 Tom de Vries * dwz.c (COMMON_OPTS): Drop -v. (usage): Add line advertising -? and -v. --- dwz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dwz.c b/dwz.c index 900bfc3..d83a1cf 100644 --- a/dwz.c +++ b/dwz.c @@ -13363,11 +13363,12 @@ static struct option dwz_options[] = static void usage (void) { -#define COMMON_OPTS "[-v] [-q] [-l ] [-L ]" +#define COMMON_OPTS "[-q] [-l ] [-L ]" error (1, 0, "Usage:\n" " dwz " COMMON_OPTS " [-h] [-m COMMONFILE] [-M NAME | -r] [FILES]\n" " dwz " COMMON_OPTS " -o OUTFILE FILE\n" + " dwz [ -v | -? ]\n" #undef COMMON_OPTS #if DEVEL "Development options:\n"