Include drive in dirpath

fasterthanlime · fasterthanlime · commit 747ccc81062a · 2016-06-19T20:11:24.000+02:00
diff --git a/src/elevate.c b/src/elevate.c
@@ -210,15 +210,33 @@ int runas(int argc, char** argv) {
 
   wchar_t *ExePath;
   toWideChar(argv[4], &ExePath);
+  wprintf(L"ExePath = '%s'\n", ExePath);
+
+  wchar_t *Drive = malloc(sizeof(wchar_t) * MAX_PATH);
+  Drive[0] = (wchar_t) '\0';
+
+  wchar_t *DirName = malloc(sizeof(wchar_t) * MAX_PATH);
+  DirName[0] = (wchar_t) '\0';
 
   wchar_t *DirPath = malloc(sizeof(wchar_t) * MAX_PATH);
   DirPath[0] = (wchar_t) '\0';
-  _wsplitpath(ExePath, NULL, DirPath, NULL, NULL);
 
-  if (wcslen(DirPath) == 0) {
+  _wsplitpath(ExePath, Drive, DirName, NULL, NULL);
+
+  if (wcslen(DirName) == 0) {
     GetCurrentDirectoryW(MAX_PATH, DirPath);
+  } else {
+    wsprintfW(DirPath, L"%s%s", Drive, DirName);
   }
 
+  int LenDirPath = wcslen(DirPath);
+  if (DirPath[LenDirPath - 1] == '\\') {
+    DirPath[LenDirPath - 1] = '\0';
+  }
+
+  wprintf(L"ExePath = '%s'\n", ExePath);
+  wprintf(L"DirPath = '%s'\n", DirPath);
+
   if (!CreateProcessWithLogonW(wuser, L".", wpassword,
     LOGON_WITH_PROFILE, wcommand, wparameters,
     CREATE_UNICODE_ENVIRONMENT, lpvEnv, DirPath,
