qemu-helper-native: showing help shouldn't be an error

Displaying a help message if help was requested isn't an error.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
index fc00e997891ae8edb0d0db17cab1518db527de0b..d745dd06cb4e4d46618fd3fd03843bc12e47079c 100644 (file)
--- a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
+++ b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
@@ -19,7 +19,7 @@
 #define TUNSETGROUP   _IOW('T', 206, int)
 #endif
 
-static void Usage(char *name)
+static void Usage(char *name, int status)
 {
   fprintf(stderr, "Create: %s [-b] [-u owner] [-g group] [-t device-name] "
          "[-f tun-clone-device]\n", name);
@@ -28,7 +28,7 @@ static void Usage(char *name)
   fprintf(stderr, "The default tun clone device is /dev/net/tun - some systems"
          " use\n/dev/misc/net/tun instead\n\n");
   fprintf(stderr, "-b will result in brief output (just the device name)\n");
-  exit(1);
+  exit(status);
 }
 
 int main(int argc, char **argv)
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
        if(*end != '\0'){
          fprintf(stderr, "'%s' is neither a username nor a numeric uid.\n",
                  optarg);
-         Usage(name);
+         Usage(name, 1);
        }
         break;
       case 'g':
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
        if(*end != '\0'){
          fprintf(stderr, "'%s' is neither a groupname nor a numeric group.\n",
                  optarg);
-         Usage(name);
+         Usage(name, 1);
        }
         break;
 
@@ -84,8 +84,10 @@ int main(int argc, char **argv)
         tun = optarg;
         break;
       case 'h':
+        Usage(name, 0);
+        break;
       default:
-        Usage(name);
+        Usage(name, 1);
     }
   }
 
@@ -93,7 +95,7 @@ int main(int argc, char **argv)
   argc -= optind;
 
   if(argc > 0)
-    Usage(name);
+    Usage(name, 1);
 
   if((tap_fd = open(file, O_RDWR)) < 0){
     fprintf(stderr, "Failed to open '%s' : ", file);