diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-28 19:32:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-28 19:32:17 -0800 |
| commit | 3c0c6dca1abc350035efedafa9ee9d705499c334 (patch) | |
| tree | f455ec710a46fd13139d643caf42a8063032bce1 /adb/commandline.c | |
| parent | d2633cb70978b42bc8b2c524951a39de197a5edd (diff) | |
| parent | 64e99545d4b5600bb5ca044fcad636ae8389b381 (diff) | |
| download | system_core-3c0c6dca1abc350035efedafa9ee9d705499c334.tar.gz system_core-3c0c6dca1abc350035efedafa9ee9d705499c334.tar.bz2 system_core-3c0c6dca1abc350035efedafa9ee9d705499c334.zip | |
am 64e99545: adb: fix -d and -e options for "adb forward" command.
Merge commit '64e99545d4b5600bb5ca044fcad636ae8389b381' into eclair-mr2-plus-aosp
* commit '64e99545d4b5600bb5ca044fcad636ae8389b381':
adb: fix -d and -e options for "adb forward" command.
Diffstat (limited to 'adb/commandline.c')
| -rw-r--r-- | adb/commandline.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 52bcedc2..3711a626 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -990,9 +990,13 @@ top: if(!strcmp(argv[0], "forward")) { if(argc != 3) return usage(); if (serial) { - snprintf(buf, sizeof buf, "host-serial:%s:forward:%s;%s",serial,argv[1],argv[2]); + snprintf(buf, sizeof buf, "host-serial:%s:forward:%s;%s",serial, argv[1], argv[2]); + } else if (ttype == kTransportUsb) { + snprintf(buf, sizeof buf, "host-usb:forward:%s;%s", argv[1], argv[2]); + } else if (ttype == kTransportLocal) { + snprintf(buf, sizeof buf, "host-local:forward:%s;%s", argv[1], argv[2]); } else { - snprintf(buf, sizeof buf, "host:forward:%s;%s",argv[1],argv[2]); + snprintf(buf, sizeof buf, "host:forward:%s;%s", argv[1], argv[2]); } if(adb_command(buf)) { fprintf(stderr,"error: %s\n", adb_error()); |