Wrote WcEscapeQuote and Use it

Author: yuk7

wsl2exe.c

@@ -27,19 +27,37 @@ int main()
     wchar_t *distName;
     distName = WslGetDefaultDistroName();
 
-    size_t total = wcslen(modName);
+    wchar_t **convdWargv;
+    convdWargv = malloc(sizeof(wchar_t*) * wargc);
+
+    wchar_t *modNameEscd;
+    modNameEscd = WcEscapeQuote(modName);
+
+    //prepare convdWargv
+    size_t modNameEscdSize = wcslen(modNameEscd);
+    convdWargv[0] = (wchar_t*)malloc(sizeof(wchar_t) * (modNameEscdSize + 1));
+    wcscpy_s(convdWargv[0], modNameEscdSize + 1, modNameEscd);
+
     for (int i = 1; i < wargc; i++) {
+        convdWargv[i] = WcEscapeQuote(wargv[i]);
+    }
+
+
+    //launcher
+    size_t total = 0;
+    for (int i = 0; i < wargc; i++) {
         total++; //for space
-        total += wcslen(wargv[i]);
+        total += wcslen(convdWargv[i]);
     }
+    total--;
 
     size_t totalSize = (sizeof(wchar_t) * (total + 1));
     wchar_t *command = (wchar_t*)malloc(totalSize);
-    wcscpy_s(command, totalSize, modName);
+    wcscpy_s(command, totalSize, convdWargv[0]);
 
     for (int i = 1; i < wargc; i++) {
         wcscat_s(command, totalSize, L" ");
-        wcscat_s(command, totalSize, wargv[i]);
+        wcscat_s(command, totalSize, convdWargv[i]);
     }
 
     HRESULT hr;

wsl2exe_ap.c

@@ -30,10 +30,13 @@ int main()
     wchar_t **convdWargv;
     convdWargv = malloc(sizeof(wchar_t*) * wargc);
 
+    wchar_t *modNameEscd;
+    modNameEscd = WcEscapeQuote(modName);
+
     //prepare convdWargv
-    size_t modNameSize = wcslen(modName);
-    convdWargv[0] = (wchar_t*)malloc(sizeof(wchar_t) * (modNameSize + 1));
-    wcscpy_s(convdWargv[0], modNameSize + 1, modName);
+    size_t modNameEscdSize = wcslen(modNameEscd);
+    convdWargv[0] = (wchar_t*)malloc(sizeof(wchar_t) * (modNameEscdSize + 1));
+    wcscpy_s(convdWargv[0], modNameEscdSize + 1, modNameEscd);
 
     for (int i = 1; i < wargc; i++) {
         if(wcsstr(wargv[i], L"\\") != NULL) {
@@ -42,13 +45,10 @@ int main()
                 fwprintf(stderr, L"ERROR: Path translation failed.\n");
                 return E_FAIL;
             }
-            size_t bufLen = wcslen(buf);
-            convdWargv[i] = (wchar_t*)malloc(sizeof(wchar_t) * (bufLen + 1));
-            wcscpy_s(convdWargv[i], bufLen + 1, buf);
+
+            convdWargv[i] = WcEscapeQuote(buf);
         } else {
-            size_t len = wcslen(wargv[i]);
-            convdWargv[i] = (wchar_t*)malloc(sizeof(wchar_t) * (len + 1));
-            wcscpy_s(convdWargv[i], len + 1, wargv[i]);
+            convdWargv[i] = WcEscapeQuote(wargv[i]);
         }
     }
 

wsl2exe_common.h

@@ -24,6 +24,43 @@ wchar_t *GetModuleName() {
     return modName;
 }
 
+wchar_t *WcEscapeQuote(wchar_t *in) {
+    size_t length = wcslen(in);
+    if (wcsstr(in, L" ") != NULL) {
+        length += 2; //add doublequote later
+    }
+
+    //search backslash '\' or '"'
+    for(int i = 0; in[i] != L'\0'; i++) {
+        if(in[i] == L'\"' || in[i] == L'\\') {
+            length++;
+        }
+    }
+
+    wchar_t* out =  (wchar_t*)malloc(sizeof(wchar_t) * (length + 1));
+    out[length] = L'\0';
+
+    int location = 0;
+    if (wcsstr(in, L" ") != NULL) {
+        out[0] = L'\"';
+        out[length - 1] = L'\"';
+        location++;
+        length--;
+    }
+
+    for (int i = 0; location < length; i++) {
+        //append backslash for escaping
+        if(in[i] == L'\"' || in[i] == L'\\') {
+            out[location] = L'\\';
+            location++;
+        }
+        out[location] = in[i];
+        location++;
+    }
+
+    return out;
+}
+
 #ifdef __cplusplus
 }
 #endif