From a0d210598fe593b694775661f597b129f929311e Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 27 Feb 2007 15:32:18 +0000
Subject: [PATCH] Fixed virsh command line arg handling for -t option

---
 AUTHORS     |  1 +
 ChangeLog   |  5 +++++
 src/virsh.c | 14 ++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ad57eec583..96dfde240e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@ Patches have also been contributed by:
   Richard W.M. Jones   <rjones@redhat.com>
   Atsushi SAKAI        <sakaia@jp.fujitsu.com>
   Kazuki Mizushima     <mizushima.kazuk@jp.fujitsu.com>
+  Saori Fukuta         <fukuta.saori@jp.fujitsu.com>
 
   [....send patches to get your name here....]
 
diff --git a/ChangeLog b/ChangeLog
index 1aa3241571..535b59327c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 27 10:25:35 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/virsh.c: Fix command line argument parsing to make
+	the '-t' argument work. Signed-off-by: Saori Fukuta
+
 Tue Feb 27 10:20:43 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/xend_internal.c: Only hardcode port = 5900+domid if
diff --git a/src/virsh.c b/src/virsh.c
index f232d8ead4..6274108887 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -3344,12 +3344,14 @@ vshParseArgv(vshControl * ctl, int argc, char **argv)
                 int sz = strlen(last);
 
                 for (o = opt; o->name; o++) {
-                    if (sz == 2 && *(last + 1) == o->val)
-                        /* valid virsh short option */
-                        valid = TRUE;
-                    else if (sz > 2 && strcmp(o->name, last + 2) == 0)
-                        /* valid virsh long option */
-                        valid = TRUE;
+                    if (o->has_arg == 1){
+                        if (sz == 2 && *(last + 1) == o->val)
+                            /* valid virsh short option */
+                            valid = TRUE;
+                        else if (sz > 2 && strcmp(o->name, last + 2) == 0)
+                            /* valid virsh long option */
+                            valid = TRUE;
+                    }
                 }
             }
             if (!valid) {