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

* commit 'a034362be4dc69d3432d7587089d371dc871e811': Make server port option work on windows
2015-01-28 03:45:32 +00:00 · 2015-01-28 03:45:32 +00:00 · 0e90714ae7
commit 0e90714ae7
parent 13aa2a4e32 a034362be4
1 changed files with 3 additions and 2 deletions
--- a/adb/adb.c
+++ b/adb/adb.c
@ -1125,10 +1125,11 @@ int launch_server(int server_port)

    /* 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 */