commit 2017f01f1221b59ad1618def6c88dc2f2c300ab7
author Elliott Hughes <enh@google.com> Wed Jan 28 03:48:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 28 03:48:19 2015 +0000
tree 4a72fc6d96374801384ced8125c5132ec3a05c8e
parent 040b946da1d1483d5bc97a5d76f79ed7de2dc91f
parent 0e90714ae7fda2b84caa37ce46982d28c0801943

am 0e90714a: am a034362b: Merge "Make server port option work on windows"

* commit '0e90714ae7fda2b84caa37ce46982d28c0801943':
  Make server port option work on windows

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 1834472..c939ef0 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1125,10 +1125,11 @@
 
     /* get path of current program */
     GetModuleFileName( NULL, program_path, sizeof(program_path) );
-
+    char args[64];
+    snprintf(args, sizeof(args), "adb -P %d fork-server server",  server_port);
     ret = CreateProcess(
             program_path,                              /* program path  */
-            "adb fork-server server",
+            args,
                                     /* the fork-server argument will set the
                                        debug = 2 in the child           */
             NULL,                   /* process handle is not inheritable */