diff options
| author | Colin Cross <ccross@android.com> | 2012-09-10 14:11:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 14:11:44 -0700 |
| commit | ae807aaa022196b2f08f64f303b380c1903b77e0 (patch) | |
| tree | 36453f0adf99bf63e0a8077433e2318635caf55a /fastboot | |
| parent | 64604840debad8f9f24c22b6b90fb572a5dc2d6b (diff) | |
| parent | c7b75dcc1aa121574d7677c97ff7d9b4ba91e624 (diff) | |
| download | system_core-ae807aaa022196b2f08f64f303b380c1903b77e0.zip system_core-ae807aaa022196b2f08f64f303b380c1903b77e0.tar.gz system_core-ae807aaa022196b2f08f64f303b380c1903b77e0.tar.bz2 | |
Merge "fastboot: move help command before usb connect" into jb-mr1-dev
Diffstat (limited to 'fastboot')
| -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 898d452..06a6a13 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -850,6 +850,11 @@ int main(int argc, char **argv) return 0; } + if (argc > 0 && !strcmp(*argv, "help")) { + usage(); + return 0; + } + usb = open_device(); while (argc > 0) { @@ -940,9 +945,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; |