Client, Win: append .exe to service process program name if missing

BOINC · Aug 14, 2017 · 7930686 · 7930686
1 parent 1c6fddb
commit 7930686
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/client/main.cpp b/client/main.cpp
@@ -454,26 +454,19 @@ int main(int argc, char** argv) {
         if (strcmp(argv[index], "-detach") == 0 || strcmp(argv[index], "--detach") == 0 ||
             strcmp(argv[index], "-detach_console") == 0 || strcmp(argv[index], "--detach_console") == 0
         ) {
-            int i, len;
-            char *commandLine;
+            int i, len=1024;
+            char commandLine[1024];
             STARTUPINFO si;
             PROCESS_INFORMATION pi;
 
             argv[index] = "-detach_phase_two";
 
-            // start with space for two '"'s
-            len = 2;
-            for (i = 0; i < argc; i++) {
-                len += (int)strlen(argv[i]) + 1;
-            }
-            if ((commandLine = (char *) malloc(len)) == NULL) {
-                // Drop back ten and punt.  Can't do the detach thing, so we just carry on.
-                // At least the program will start.
-                break;
-            }
             commandLine[0] = '"';
             // OK, we can safely use strcpy and strcat, since we know that we allocated enough
-            strlcpy(&commandLine[1], argv[0], len);
+            strlcpy(commandLine, argv[0], len);
+            if (!strstr(commandLine, ".exe")) {
+                strlcat(commandLine, ".exe", len);
+            }
             strlcat(commandLine, "\"", len);
             for (i = 1; i < argc; i++) {
                 strlcat(commandLine, " ", len);
@@ -489,6 +482,7 @@ int main(int argc, char** argv) {
                 exit(0);
             }
             break;
+
         }
 #endif