diff options
| author | Scott Anderson <saa@android.com> | 2012-06-05 16:21:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 16:21:04 -0700 |
| commit | dd32794a29ddd3b630b8eb7f8032c168a13b2cb4 (patch) | |
| tree | 766901eb4b993a9ee78fead152c0527ccf02bf2f /fastboot | |
| parent | 0e9e13eb46d8ffbb456f937db4a8fb0da02dd5d2 (diff) | |
| parent | 866b1bd5051db4f22b634df1f8a06bc1c9aa2e26 (diff) | |
| download | system_core-dd32794a29ddd3b630b8eb7f8032c168a13b2cb4.zip system_core-dd32794a29ddd3b630b8eb7f8032c168a13b2cb4.tar.gz system_core-dd32794a29ddd3b630b8eb7f8032c168a13b2cb4.tar.bz2 | |
am 866b1bd5: fastboot: Make the format of "devices -l" match adb\'s
* commit '866b1bd5051db4f22b634df1f8a06bc1c9aa2e26':
fastboot: Make the format of "devices -l" match adb's
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/fastboot.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index 5858e23..c44f937 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -185,15 +185,13 @@ int list_devices_callback(usb_ifc_info *info) if (!serial[0]) { serial = "????????????"; } + // output compatible with "adb devices" if (!long_listing) { - // output compatible with "adb devices" printf("%s\tfastboot\n", serial); + } else if (!info->device_path) { + printf("%-22s fastboot\n", serial); } else { - char* device_path = info->device_path; - if (!device_path[0]) { - device_path = "????????????"; - } - printf("%s\t%s\tfastboot\n", serial, device_path); + printf("%-22s fastboot %s\n", serial, info->device_path); } } |