public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/clvmd.c Date: Tue, 08 Mar 2011 13:27:00 -0000 [thread overview] Message-ID: <20110308132741.16819.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2011-03-08 13:27:40 Modified files: . : WHATS_NEW daemons/clvmd : clvmd.c Log message: Fix clvmd return code for bad options. We should return exit code 2 for unknown option. Patch also adds standard --help option instead. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=666991 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1936&r2=1.1937 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.98&r2=1.99 --- LVM2/WHATS_NEW 2011/03/06 16:47:43 1.1936 +++ LVM2/WHATS_NEW 2011/03/08 13:27:39 1.1937 @@ -1,5 +1,6 @@ Version 2.02.85 - =================================== + Support --help option for clvmd and return error for unknown option. Use system page size and not hardcoded value in locking code check. Fix reading of released memory for printing segment type. Fix syslog initialisation in clvmd to respect lvm.conf setting. --- LVM2/daemons/clvmd/clvmd.c 2011/03/03 13:05:40 1.98 +++ LVM2/daemons/clvmd/clvmd.c 2011/03/08 13:27:40 1.99 @@ -20,6 +20,7 @@ #include "clvmd-common.h" #include <pthread.h> +#include <getopt.h> #include "clvmd-comms.h" #include "clvm.h" @@ -335,7 +336,7 @@ struct local_client *newfd; struct utsname nodeinfo; struct lvm_startup_params lvm_params; - signed char opt; + int opt; int cmd_timeout = DEFAULT_CMD_TIMEOUT; int start_timeout = 0; if_type_t cluster_iface = IF_AUTO; @@ -346,19 +347,21 @@ int clusterwide_opt = 0; mode_t old_mask; + struct option longopts[] = { + { "help", 0, 0, 'h' }, + { NULL, 0, 0, 0 } + }; + /* Deal with command-line arguments */ opterr = 0; optind = 0; - while ((opt = getopt(argc, argv, "?vVhfd::t:RST:CI:E:")) != EOF) { + while ((opt = getopt_long(argc, argv, "vVhfd::t:RST:CI:E:", + longopts, NULL)) != -1) { switch (opt) { case 'h': usage(argv[0], stdout); exit(0); - case '?': - usage(argv[0], stderr); - exit(0); - case 'R': check_permissions(); return refresh_clvmd(1)==1?0:1; @@ -409,6 +412,9 @@ exit(0); break; + default: + usage(argv[0], stderr); + exit(2); } }
next reply other threads:[~2011-03-08 13:27 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-03-08 13:27 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-02-28 11:06 zkabelac 2012-02-28 9:58 zkabelac 2012-02-28 9:53 zkabelac 2012-02-27 11:26 zkabelac 2012-02-27 9:58 zkabelac 2011-10-11 9:54 zkabelac 2011-10-11 9:26 zkabelac 2011-09-16 14:40 mbroz 2011-08-11 12:57 mbroz 2011-06-28 13:42 zkabelac 2011-03-30 12:36 zkabelac 2011-03-08 22:48 zkabelac 2010-12-13 10:49 prajnoha 2010-12-01 12:41 zkabelac 2010-12-01 10:46 zkabelac 2010-04-06 15:29 ccaulfield 2010-02-02 8:54 ccaulfield 2009-10-12 8:33 ccaulfield 2009-09-01 9:48 ccaulfield 2009-08-13 10:39 ccaulfield 2009-03-24 11:49 ccaulfield 2008-11-21 13:48 ccaulfield 2008-06-13 7:44 ccaulfield 2008-05-09 9:59 ccaulfield 2008-03-28 12:58 ccaulfield 2008-03-17 9:37 ccaulfield 2008-02-15 14:12 meyering 2007-11-15 10:16 pcaulfield 2007-03-29 13:59 pcaulfield 2006-12-11 13:48 pcaulfield 2006-11-30 9:44 pcaulfield 2005-04-01 13:01 pcaulfield 2005-02-08 9:05 pcaulfield 2005-01-24 15:31 pcaulfield 2005-01-05 14:41 pcaulfield 2004-10-06 12:36 pcaulfield 2004-10-06 10:12 pcaulfield
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110308132741.16819.qmail@sourceware.org \ --to=mbroz@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).