Fix metapath can't open quoted path.

zufuliu · Nov 1, 2018 · db1b22b · db1b22b
1 parent cd0cbe4
commit db1b22b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/metapath/src/Helpers.c b/metapath/src/Helpers.c
@@ -883,6 +883,21 @@ void StrTab2Space(LPWSTR lpsz) {
 	}
 }
 
+//=============================================================================
+//
+// PathFixBackslashes() - in place conversion
+//
+void PathFixBackslashes(LPWSTR lpsz) {
+	WCHAR *c = lpsz;
+	while ((c = StrChr(c, L'/')) != NULL) {
+		if (*CharPrev(lpsz, c) == L':' && *CharNext(c) == L'/') {
+			c += 2;
+		} else {
+			*c = L'\\';
+		}
+	}
+}
+
 //=============================================================================
 //
 //  ExpandEnvironmentStringsEx()

diff --git a/metapath/src/Helpers.h b/metapath/src/Helpers.h
@@ -322,6 +322,7 @@ LPWSTR GetFilenameStr(LPWSTR lpFile);
 
 void PrepareFilterStr(LPWSTR lpFilter);
 void StrTab2Space(LPWSTR lpsz);
+void PathFixBackslashes(LPWSTR lpsz);
 void ExpandEnvironmentStringsEx(LPWSTR lpSrc, DWORD dwSrc);
 void PathCanonicalizeEx(LPWSTR lpSrc);
 DWORD SearchPathEx(LPCWSTR lpPath, LPCWSTR lpFileName, LPCWSTR lpExtension,

diff --git a/metapath/src/metapath.c b/metapath/src/metapath.c
@@ -2796,6 +2796,8 @@ void ParseCommandLine(void) {
 
 			lpPathArg = GlobalAlloc(GPTR, sizeof(WCHAR) * (MAX_PATH + 2));
 			lstrcpyn(lpPathArg, lp3, MAX_PATH);
+			PathFixBackslashes(lpPathArg);
+			StrTrim(lpPathArg, L" \"");
 			break;
 		}
 	}