Commit 44923347 authored by Jason Edmeades's avatar Jason Edmeades Committed by Alexandre Julliard

cmd.exe: Support cd .. when saving current directory.

parent 84f02a6a
...@@ -1865,6 +1865,9 @@ void WCMD_setshow_default (WCHAR *command) { ...@@ -1865,6 +1865,9 @@ void WCMD_setshow_default (WCHAR *command) {
return; return;
} else { } else {
/* Save away the actual new directory, to store as current location */
GetCurrentDirectoryW (sizeof(string)/sizeof(WCHAR), string);
/* Restore old directory if drive letter would change, and /* Restore old directory if drive letter would change, and
CD x:\directory /D (or pushd c:\directory) not supplied */ CD x:\directory /D (or pushd c:\directory) not supplied */
if ((strstrW(quals, parmD) == NULL) && if ((strstrW(quals, parmD) == NULL) &&
......
...@@ -419,6 +419,7 @@ int wmain (int argc, WCHAR *argvW[]) ...@@ -419,6 +419,7 @@ int wmain (int argc, WCHAR *argvW[])
static const WCHAR fmt[] = {'=','%','c',':','\0'}; static const WCHAR fmt[] = {'=','%','c',':','\0'};
wsprintf(envvar, fmt, string[0]); wsprintf(envvar, fmt, string[0]);
SetEnvironmentVariable(envvar, string); SetEnvironmentVariable(envvar, string);
WINE_TRACE("Set %s to %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(string));
} }
if (opt_k) { if (opt_k) {
...@@ -643,7 +644,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, ...@@ -643,7 +644,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects,
if (GetEnvironmentVariable(envvar, dir, MAX_PATH) == 0) { if (GetEnvironmentVariable(envvar, dir, MAX_PATH) == 0) {
static const WCHAR fmt[] = {'%','s','\\','\0'}; static const WCHAR fmt[] = {'%','s','\\','\0'};
wsprintf(cmd, fmt, cmd); wsprintf(cmd, fmt, cmd);
WINE_TRACE("No special directory settings, using dir of %s\n", wine_dbgstr_w(cmd));
} }
WINE_TRACE("Got directory %s as %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(cmd));
status = SetCurrentDirectory (cmd); status = SetCurrentDirectory (cmd);
if (!status) WCMD_print_error (); if (!status) WCMD_print_error ();
HeapFree( GetProcessHeap(), 0, cmd ); HeapFree( GetProcessHeap(), 0, cmd );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment