More reliable way to deal with whitespace

firai · web-flow · commit 4a624c67f912 · 2025-04-26T14:46:51.000+08:00
diff --git a/portable/launchers_src/launcher_template_WINDOWS.cpp b/portable/launchers_src/launcher_template_WINDOWS.cpp
@@ -19,25 +19,25 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
     std::wstring exeDir = exePath;
     exeDir = exeDir.substr(0, exeDir.find_last_of(L"\\/"));
 
-    // Get command line string
+    // Get command line string and extract arguments
     LPWSTR commandLine = GetCommandLineW();
-    // Skip the current executable path and name
     std::wstring args;
-    if (commandLine) {
-        // If path is double quoted, skip the entire double quote
-        if (commandLine[0] == L'"') {
-            LPWSTR closingQuote = wcschr(commandLine + 1, L'"');
-            if (closingQuote) {
-                args = closingQuote + 1; // Skip closing quote and space
-            }
-        // Otherwise skip to first space
-        } else {
-            LPWSTR spacePos = wcschr(commandLine, L' ');
-            if (spacePos) {
-                args = spacePos + 1; // GetCommandLineW puts 2 spaces when path isn't double quoted
-            }
+    // If executable path is double quoted, skip the entire quoted section
+    if (commandLine[0] == L'"') {
+        LPWSTR closingQuote = wcschr(commandLine + 1, L'"');
+        if (closingQuote) {
+            args = closingQuote + 1;
+        }
+    // For non-quoted path, skip to character after first space if it exists
+    } else {
+        LPWSTR spacePos = wcschr(commandLine, L' ');
+        if (spacePos) {
+            args = spacePos + 1;
         }
     }
+    // Strip leading whitespace
+    size_t args_start = args.find_first_not_of(L" ");
+    args = (args_start != std::wstring::npos) ? args.substr(args_start) : L"";
 
     // Define the path to the "scripts" directory
     std::wstring scriptsDir = exeDir + L"\\scripts";
@@ -60,7 +60,7 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
     // Define the command to run and append arguments if present
     std::wstring target;
     if (!args.empty()) {
-        target = L"cmd.exe /c \"\"" LAUNCH_TARGET L"\"" + args + L"\"";
+        target = L"cmd.exe /c \"\"" LAUNCH_TARGET L"\" " + args + L"\"";
     } else {
         target = L"cmd.exe /c \"" LAUNCH_TARGET L"\"";
     }
