From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 9 Oct 2004 16:44:06 +0000 (+0000)
Subject: BSD getopt fix
X-Git-Tag: release_0_6_1~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e388818682ebce3ae8132c1b8ed2089d6c8ec07c;p=thirdparty%2Fqemu.git

BSD getopt fix


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1103 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/qemu-img.c b/qemu-img.c
index 196e0287f2d..132428cf6dd 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -333,7 +333,6 @@ static int img_create(int argc, char **argv)
             break;
         }
     }
-    optind++;
     if (optind >= argc) 
         help();
     filename = argv[optind++];
@@ -403,7 +402,6 @@ static int img_commit(int argc, char **argv)
             break;
         }
     }
-    optind++;
     if (optind >= argc) 
         help();
     filename = argv[optind++];
@@ -511,7 +509,6 @@ static int img_convert(int argc, char **argv)
             break;
         }
     }
-    optind++;
     if (optind >= argc) 
         help();
     filename = argv[optind++];
@@ -639,7 +636,6 @@ static int img_info(int argc, char **argv)
             break;
         }
     }
-    optind++;
     if (optind >= argc) 
         help();
     filename = argv[optind++];
@@ -686,6 +682,7 @@ int main(int argc, char **argv)
     if (argc < 2)
         help();
     cmd = argv[1];
+    optind++;
     if (!strcmp(cmd, "create")) {
         img_create(argc, argv);
     } else if (!strcmp(cmd, "commit")) {