From: Eric Blake <eblake@redhat.com>
Date: Mon, 14 Mar 2011 16:44:37 +0000 (-0600)
Subject: virsh: allow empty string arguments
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6eaa4ee41b69978c7e18ce896f537b0afc552446;p=libvirt.git

virsh: allow empty string arguments

"virsh connect ''" should try to connect to the default connection,
but the previous patch made it issue a warning about an invalid URI.

* tools/virsh.c (VSH_OFLAG_EMPTY_OK): New option flag.
(vshCommandOptString): Per the declaration, value is required to
be non-NULL.  Honor new flag.
(opts_connect): Allow empty string connection.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 42ebd55ca6..50ca50f9f8 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -152,8 +152,11 @@ typedef enum {
 /*
  * Command Option Flags
  */
-#define VSH_OFLAG_NONE    0     /* without flags */
-#define VSH_OFLAG_REQ    (1 << 1)       /* option required */
+enum {
+    VSH_OFLAG_NONE     = 0,        /* without flags */
+    VSH_OFLAG_REQ      = (1 << 0), /* option required */
+    VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */
+};
 
 /* dummy */
 typedef struct __vshControl vshControl;
@@ -685,7 +688,8 @@ static const vshCmdInfo info_connect[] = {
 };
 
 static const vshCmdOptDef opts_connect[] = {
-    {"name",     VSH_OT_DATA, 0, N_("hypervisor connection URI")},
+    {"name",     VSH_OT_DATA, VSH_OFLAG_EMPTY_OK,
+     N_("hypervisor connection URI")},
     {"readonly", VSH_OT_BOOL, 0, N_("read-only connection")},
     {NULL, 0, 0, NULL}
 };
@@ -10993,14 +10997,16 @@ vshCommandOptString(const vshCmd *cmd, const char *name, const char **value)
     int ret = 0;
 
     if (arg && arg->data) {
-        ret = -1;
-        if (*arg->data) {
-            if (value) {
-                *value = arg->data;
-                ret = 1;
-            }
+        if (*arg->data
+            || (arg->def && (arg->def->flag & VSH_OFLAG_EMPTY_OK))) {
+            *value = arg->data;
+            ret = 1;
         } else if (arg->def && ((arg->def->flag) & VSH_OFLAG_REQ)) {
             vshError(NULL, _("Missing required option '%s'"), name);
+            ret = -1;
+        } else {
+            /* Treat "--option ''" as if option had not been specified. */
+            ret = 0;
         }
     }