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.
diff --git a/adb/commandline.c b/adb/commandline.c
index 52bcedc..3711a62 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -990,9 +990,13 @@
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());