Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] CHDIR: Some features are available only when extensions are enabled. Update the SetRootPath() as well.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-07-12 20:45:59 +02:00
parent fe9aa42d5f
commit 3d4af22328
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
base/shell/cmd/internal.c
View file

@ -194,9 +194,22 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath)
goto Fail;
}
/* Convert the full path to its correct case.
* Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 */
GetPathCase(OutPathTemp, OutPath);
if (bEnableExtensions)
{
/*
* Convert the full path to its correct case, and
* resolve any wilcard present as well in the path
* and retrieve the first result.
* Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32
* Example: C:\WINDOWS\S* => C:\WINDOWS\System,
* or C:\WINDOWS\System32, depending on the user's OS.
*/
GetPathCase(OutPathTemp, OutPath);
}
else
{
_tcscpy(OutPath, OutPathTemp);
}
/* Use _tchdir(), since unlike SetCurrentDirectory() it updates
* the current-directory-on-drive environment variables. */
@ -239,12 +252,27 @@ INT cmd_chdir(LPTSTR param)
return 0;
}
/* Remove extra quotes and strip trailing whitespace */
//
// FIXME: Use the split() tokenizer if bEnableExtensions == FALSE,
// so as to cut the parameter at the first separator (space, ',', ';'):
// - When bEnableExtensions == FALSE, doing
// CD system32;winsxs
// will go into system32, (but: CD "system32;winsxs" will fail as below), while
// - When bEnableExtensions == TRUE, it will fail because the "system32;winsxs"
// directory does not exist.
//
/* Remove extra quotes */
StripQuotes(param);
tmp = param + _tcslen(param) - 1;
while (tmp > param && _istspace(*tmp))
--tmp;
*(tmp + 1) = _T('\0');
if (bEnableExtensions)
{
/* Strip trailing whitespace */
tmp = param + _tcslen(param) - 1;
while (tmp > param && _istspace(*tmp))
--tmp;
*(tmp + 1) = _T('\0');
}
/* Reset the error level */
nErrorLevel = 0;