Permalink
Browse files

am eb7ee9c: am 922b460: Merge "fastboot: move help command before usb…

… connect"

* commit 'eb7ee9c0c513160d8db5c76a82f56ed966ec41c0':
  fastboot: move help command before usb connect
  • Loading branch information...
colincross authored and Android Git Automerger committed Sep 10, 2012
2 parents 6de2678 + eb7ee9c commit e6b898106c7c6f42529db185481d1d4805e91aff
Showing with 5 additions and 3 deletions.
  1. +5 −3 fastboot/fastboot.c
View
@@ -832,6 +832,11 @@ int main(int argc, char **argv)
return 0;
}
+ if (argc > 0 && !strcmp(*argv, "help")) {
+ usage();
+ return 0;
+ }
+
usb = open_device();
while (argc > 0) {
@@ -922,9 +927,6 @@ int main(int argc, char **argv)
wants_reboot = 1;
} else if(!strcmp(*argv, "oem")) {
argc = do_oem_command(argc, argv);
- } else if (!strcmp(*argv, "help")) {
- usage();
- return 0;
} else {
usage();
return 1;

0 comments on commit e6b8981

Please sign in to comment.