summaryrefslogtreecommitdiffstats
path: root/adb/commandline.c
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-12-14 14:42:17 -0800
committerRomain Guy <romainguy@android.com>2009-12-14 14:45:17 -0800
commit311add489e4a1712d201c3b83fa364d5569e6788 (patch)
tree20ca47cca7774bf7a6f90d42c73307e37fe7020a /adb/commandline.c
parent8cd186d9e0aac1b18e4c8b32e3d79beedb728ab3 (diff)
downloadsystem_core-311add489e4a1712d201c3b83fa364d5569e6788.zip
system_core-311add489e4a1712d201c3b83fa364d5569e6788.tar.gz
system_core-311add489e4a1712d201c3b83fa364d5569e6788.tar.bz2
Add adb reboot-bootloader to match fastboot reboot-bootloader.
Also fix the formatting of one of the options in the help message.
Diffstat (limited to 'adb/commandline.c')
-rw-r--r--adb/commandline.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/adb/commandline.c b/adb/commandline.c
index 3b3e6df..cb98d05 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -151,8 +151,9 @@ void help()
" adb status-window - continuously print device status for a specified device\n"
" adb remount - remounts the /system partition on the device read-write\n"
" adb reboot [bootloader|recovery] - reboots the device, optionally into the bootloader or recovery program\n"
+ " adb reboot-bootloader - reboots the device into the bootloader\n"
" adb root - restarts the adbd daemon with root permissions\n"
- " adb usb - restarts the adbd daemon listening on USB"
+ " adb usb - restarts the adbd daemon listening on USB\n"
" adb tcpip <port> - restarts the adbd daemon listening on TCP on the specified port"
"\n"
"networking:\n"
@@ -929,10 +930,13 @@ top:
}
if(!strcmp(argv[0], "remount") || !strcmp(argv[0], "reboot")
+ || !strcmp(argv[0], "reboot-bootloader")
|| !strcmp(argv[0], "tcpip") || !strcmp(argv[0], "usb")
|| !strcmp(argv[0], "root")) {
char command[100];
- if (argc > 1)
+ if (!strcmp(argv[0], "reboot-bootloader"))
+ snprintf(command, sizeof(command), "reboot:bootloader");
+ else if (argc > 1)
snprintf(command, sizeof(command), "%s:%s", argv[0], argv[1]);
else
snprintf(command, sizeof(command), "%s:", argv[0]);