Commit e388818682ebce3ae8132c1b8ed2089d6c8ec07c
1 parent
02d2c54c
BSD getopt fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1103 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
1 additions
and
4 deletions
qemu-img.c
| @@ -333,7 +333,6 @@ static int img_create(int argc, char **argv) | @@ -333,7 +333,6 @@ static int img_create(int argc, char **argv) | ||
| 333 | break; | 333 | break; |
| 334 | } | 334 | } |
| 335 | } | 335 | } |
| 336 | - optind++; | ||
| 337 | if (optind >= argc) | 336 | if (optind >= argc) |
| 338 | help(); | 337 | help(); |
| 339 | filename = argv[optind++]; | 338 | filename = argv[optind++]; |
| @@ -403,7 +402,6 @@ static int img_commit(int argc, char **argv) | @@ -403,7 +402,6 @@ static int img_commit(int argc, char **argv) | ||
| 403 | break; | 402 | break; |
| 404 | } | 403 | } |
| 405 | } | 404 | } |
| 406 | - optind++; | ||
| 407 | if (optind >= argc) | 405 | if (optind >= argc) |
| 408 | help(); | 406 | help(); |
| 409 | filename = argv[optind++]; | 407 | filename = argv[optind++]; |
| @@ -511,7 +509,6 @@ static int img_convert(int argc, char **argv) | @@ -511,7 +509,6 @@ static int img_convert(int argc, char **argv) | ||
| 511 | break; | 509 | break; |
| 512 | } | 510 | } |
| 513 | } | 511 | } |
| 514 | - optind++; | ||
| 515 | if (optind >= argc) | 512 | if (optind >= argc) |
| 516 | help(); | 513 | help(); |
| 517 | filename = argv[optind++]; | 514 | filename = argv[optind++]; |
| @@ -639,7 +636,6 @@ static int img_info(int argc, char **argv) | @@ -639,7 +636,6 @@ static int img_info(int argc, char **argv) | ||
| 639 | break; | 636 | break; |
| 640 | } | 637 | } |
| 641 | } | 638 | } |
| 642 | - optind++; | ||
| 643 | if (optind >= argc) | 639 | if (optind >= argc) |
| 644 | help(); | 640 | help(); |
| 645 | filename = argv[optind++]; | 641 | filename = argv[optind++]; |
| @@ -686,6 +682,7 @@ int main(int argc, char **argv) | @@ -686,6 +682,7 @@ int main(int argc, char **argv) | ||
| 686 | if (argc < 2) | 682 | if (argc < 2) |
| 687 | help(); | 683 | help(); |
| 688 | cmd = argv[1]; | 684 | cmd = argv[1]; |
| 685 | + optind++; | ||
| 689 | if (!strcmp(cmd, "create")) { | 686 | if (!strcmp(cmd, "create")) { |
| 690 | img_create(argc, argv); | 687 | img_create(argc, argv); |
| 691 | } else if (!strcmp(cmd, "commit")) { | 688 | } else if (!strcmp(cmd, "commit")) { |