diff options
| author | Colin Cross <ccross@android.com> | 2012-09-10 14:13:29 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-10 14:13:29 -0700 |
| commit | 922b460cc790722ffc303b200f02958e4066a2de (patch) | |
| tree | 13f3be854380ef73c7305b08c98cdadcb4fb8441 | |
| parent | 82959f5e46870cb57675d1ebba97294c56508949 (diff) | |
| parent | 80f9867431af4632749890b24c0256f0ab07640d (diff) | |
| download | system_core-922b460cc790722ffc303b200f02958e4066a2de.zip system_core-922b460cc790722ffc303b200f02958e4066a2de.tar.gz system_core-922b460cc790722ffc303b200f02958e4066a2de.tar.bz2 | |
Merge "fastboot: move help command before usb connect"
| -rw-r--r-- | fastboot/fastboot.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index b6eab8c..c9def7b 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -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; |