From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 7 Jun 2011 09:11:10 +0000 (+0800)
Subject: add VSH_OFLAG_REQ_OPT options
X-Git-Tag: v0.9.3-rc1~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb246acfa7950929111537fff917af9e3ade552b;p=thirdparty%2Flibvirt.git

add VSH_OFLAG_REQ_OPT options

A VSH_OFLAG_REQ_OPT option means --optionname is required when used.
It will kill any ambiguity, even a !VSH_OFLAG_REQ option listed before
a VSH_OFLAG_REQ option, if the !VSH_OFLAG_REQ option is a
VSH_OFLAG_REQ_OPT option.

It will help us use optional argument with VSH_OT_ARGV argument.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---

diff --git a/tools/virsh.c b/tools/virsh.c
index d2f4020ee2..5ce3d22094 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -152,6 +152,7 @@ enum {
     VSH_OFLAG_NONE     = 0,        /* without flags */
     VSH_OFLAG_REQ      = (1 << 0), /* option required */
     VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */
+    VSH_OFLAG_REQ_OPT  = (1 << 2), /* --optionname required */
 };
 
 /* dummy */
@@ -11453,6 +11454,12 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint32_t* opts_need_arg,
                 return -1; /* bool options can't be mandatory */
             continue;
         }
+        if (opt->flag & VSH_OFLAG_REQ_OPT) {
+            if (opt->flag & VSH_OFLAG_REQ)
+                *opts_required |= 1 << i;
+            continue;
+        }
+
         *opts_need_arg |= 1 << i;
         if (opt->flag & VSH_OFLAG_REQ) {
             if (optional)