Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a new function to return a path with correct casing. Remove the get[short/long]pathname hack that was there before to do it.

Browse source 
svn path=/trunk/; revision=18889
This commit is contained in:
Brandon Turner 2005-10-30 17:50:03 +00:00
parent 23d5494796
commit 7aebf134dc
3 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/system/cmd/cmd.h
View file

@ -300,6 +300,7 @@ BOOL IsValidPathName (LPCTSTR);
BOOL IsExistingFile (LPCTSTR); BOOL IsExistingFile (LPCTSTR);
BOOL IsExistingDirectory (LPCTSTR); BOOL IsExistingDirectory (LPCTSTR);
BOOL FileGetString (HANDLE, LPTSTR, INT); BOOL FileGetString (HANDLE, LPTSTR, INT);
VOID GetPathCase(TCHAR *, TCHAR *);
#define PROMPT_NO 0 #define PROMPT_NO 0
#define PROMPT_YES 1 #define PROMPT_YES 1

16
reactos/subsys/system/cmd/internal.c
View file

@ -241,8 +241,8 @@ BOOL SetRootPath(TCHAR *InPath)
/* The use of both of these together will correct the case of a path /* The use of both of these together will correct the case of a path
where as one alone or GetFullPath will not. Exameple: where as one alone or GetFullPath will not. Exameple:
c:\windows\SYSTEM32 => C:\WINDOWS\system32 */ c:\windows\SYSTEM32 => C:\WINDOWS\system32 */
GetShortPathName(OutPathTemp, OutPathTemp2, MAX_PATH); GetFullPathName(OutPathTemp, MAX_PATH, OutPathTemp2, NULL);
GetLongPathName(OutPathTemp2, OutPath, MAX_PATH); GetPathCase(OutPathTemp2, OutPath);
fail = SetCurrentDirectory(OutPath); fail = SetCurrentDirectory(OutPath);
if (!fail) if (!fail)
@ -395,16 +395,16 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
_tcscat(szFinalPath,f.cFileName); _tcscat(szFinalPath,f.cFileName);
if ((f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) if ((f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)
{ {
if(!SetRootPath(szFinalPath)) if(!SetRootPath(szFinalPath))
{ {
/* Change for /D */ /* Change for /D */
if(bChangeDrive) if(bChangeDrive)
{ {
_tcsupr(szFinalPath); _tcsupr(szFinalPath);
GetLongPathName(szFinalPath, szPath, MAX_PATH); GetPathCase(szFinalPath, szPath);
SetCurrentDirectory(szPath); SetCurrentDirectory(szPath);
} }
return 0; return 0;
} }

40
reactos/subsys/system/cmd/misc.c
View file

@ -68,6 +68,46 @@ TCHAR cgetchar (VOID)
#endif /* _UNICODE */ #endif /* _UNICODE */
} }
/*
* Takes a path in and returns it with the correct case of the letters
*/
VOID GetPathCase( TCHAR * Path, TCHAR * OutPath)
{
INT i = 0;
_tcscpy(OutPath, _T(""));
TCHAR TempPath[MAX_PATH];
WIN32_FIND_DATA FindFileData;
HANDLE hFind;
_tcscpy(TempPath, _T(""));
for(i = 0; i < _tcslen(Path); i++)
{
if(Path[i] != _T('\\'))
{
_tcsncat(TempPath, &Path[i], 1);
if(i != _tcslen(Path) - 1)
continue;
}
/* Handle the base part of the path different.
Because if you put it into findfirstfile, it will
return your current folder */
if(_tcslen(TempPath) == 2 && TempPath[1] == _T(':'))
{
_tcscat(OutPath, TempPath);
_tcscat(OutPath, _T("\\"));
_tcscat(TempPath, _T("\\"));
}
else
{
hFind = FindFirstFile(TempPath,&FindFileData);
_tcscat(TempPath, _T("\\"));
_tcscat(OutPath, FindFileData.cFileName);
_tcscat(OutPath, _T("\\"));
CloseHandle(hFind);
}
}
}
/* /*
* Check if Ctrl-Break was pressed during the last calls * Check if Ctrl-Break was pressed during the last calls