Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:25:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Jens Collin <jens.collin@lakhei.com>

Browse source 
Add PATHEXT env var and use it to locate command

svn path=/trunk/; revision=10081
This commit is contained in:
Gé van Geldorp 2004-07-11 16:13:44 +00:00
parent 839cdb0644
commit c8d9ece95d
3 changed files with 111 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/bootdata/hivesys.inf
View file

@ -103,6 +103,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x000
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP"
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00020000,".COM;.EXE;.BAT;.CMD"
; Known DLLs ; Known DLLs
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","DllDirectory",0x00020000,"%SystemRoot%\system32" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","DllDirectory",0x00020000,"%SystemRoot%\system32"

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

@ -359,7 +359,8 @@ BOOL IsValidPathName (LPCTSTR pszPath)
BOOL IsValidFileName (LPCTSTR pszPath) BOOL IsValidFileName (LPCTSTR pszPath)
{ {
return (GetFileAttributes (pszPath) != 0xFFFFFFFF); DWORD attr = GetFileAttributes (pszPath);
return (attr != 0xFFFFFFFF && (! (attr & FILE_ATTRIBUTE_DIRECTORY)) );
} }

244
reactos/subsys/system/cmd/where.c
View file

@ -67,6 +67,11 @@
* *
* 20-Apr-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>) * 20-Apr-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
* Some minor changes and improvements. * Some minor changes and improvements.
*
* 10-Jul-2004 (Jens Collin <jens.collin@lakhei.com>)
* Fixed searxhing for files with specific extensions in PATHEXT order..
*
*/ */
#include "config.h" #include "config.h"
@ -82,29 +87,23 @@
#define ENV_BUFFER_SIZE 1024 #define ENV_BUFFER_SIZE 1024
static LPTSTR ext[] = {_T(".bat"), _T(".cmd"), _T(".com"), _T(".exe")};
static INT nExtCount = sizeof(ext) / sizeof(LPTSTR);
/* searches for file using path info. */ /* searches for file using path info. */
BOOL BOOL
SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName) SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtension)
{ {
TCHAR szPathBuffer[MAX_PATH]; TCHAR szPathBuffer[MAX_PATH];
LPTSTR pszBuffer = NULL; LPTSTR pszBuffer = NULL;
DWORD dwBuffer, len; DWORD dwBuffer, len;
INT n; LPTSTR s,f;
LPTSTR p,s,f; // initialize full name buffer
/* initialize full name buffer */
*pFullName = _T('\0'); *pFullName = _T('\0');
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName); DebugPrintf (_T("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n"), pFileName, pExtension);
#endif #endif
// Check if valid directly on specified path
if (_tcschr (pFileName, _T('\\')) != NULL) if (_tcschr (pFileName, _T('\\')) != NULL)
{ {
LPTSTR pFilePart; LPTSTR pFilePart;
@ -120,32 +119,9 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
if(pFilePart == 0) if(pFilePart == 0)
return FALSE; return FALSE;
// Add extension and test file:
if (pExtension)
if (_tcschr (pFilePart, _T('.')) != NULL) _tcscat(szPathBuffer, pExtension);
{
#ifdef _DEBUG
DebugPrintf (_T("Filename extension!\n"));
#endif
_tcscpy (pFullName, szPathBuffer);
return TRUE;
}
else
{
#ifdef _DEBUG
DebugPrintf (_T("No filename extension!\n"));
#endif
p = szPathBuffer + _tcslen (szPathBuffer);
for (n = 0; n < nExtCount; n++)
{
_tcscpy (p, ext[n]);
#ifdef _DEBUG
DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
#endif
if (IsValidFileName (szPathBuffer)) if (IsValidFileName (szPathBuffer))
{ {
@ -155,12 +131,33 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
_tcscpy (pFullName, szPathBuffer); _tcscpy (pFullName, szPathBuffer);
return TRUE; return TRUE;
} }
}
return FALSE; return FALSE;
} }
// search in current directory
len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
if (szPathBuffer[len - 1] != _T('\\'))
{
szPathBuffer[len] = _T('\\');
szPathBuffer[len + 1] = _T('\0');
}
_tcscat (szPathBuffer, pFileName);
if (pExtension)
_tcscat (szPathBuffer, pExtension);
if (IsValidFileName (szPathBuffer))
{
#ifdef _DEBUG
DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
#endif
_tcscpy (pFullName, szPathBuffer);
return TRUE;
} }
/* load environment varable PATH into buffer */
// load environment varable PATH into buffer
pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE);
if (dwBuffer > ENV_BUFFER_SIZE) if (dwBuffer > ENV_BUFFER_SIZE)
@ -169,45 +166,8 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
GetEnvironmentVariable (_T("PATH"), pszBuffer, dwBuffer * sizeof (TCHAR)); GetEnvironmentVariable (_T("PATH"), pszBuffer, dwBuffer * sizeof (TCHAR));
} }
if (!(p = _tcsrchr (pFileName, _T('.'))) ||
_tcschr (p + 1, _T('\\')))
{
/* There is no extension ==> test all the extensions. */
#ifdef _DEBUG
DebugPrintf (_T("No filename extension!\n"));
#endif
/* search in current directory */ // search in PATH
len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
if (szPathBuffer[len - 1] != _T('\\'))
{
szPathBuffer[len] = _T('\\');
szPathBuffer[len + 1] = _T('\0');
}
_tcscat (szPathBuffer, pFileName);
p = szPathBuffer + _tcslen (szPathBuffer);
for (n = 0; n < nExtCount; n++)
{
_tcscpy (p, ext[n]);
#ifdef _DEBUG
DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
#endif
if (IsValidFileName (szPathBuffer))
{
#ifdef _DEBUG
DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
#endif
free (pszBuffer);
_tcscpy (pFullName, szPathBuffer);
return TRUE;
}
}
/* search in PATH */
s = pszBuffer; s = pszBuffer;
while (s && *s) while (s && *s)
{ {
@ -233,15 +193,8 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
} }
_tcscat (szPathBuffer, pFileName); _tcscat (szPathBuffer, pFileName);
p = szPathBuffer + _tcslen (szPathBuffer); if (pExtension)
_tcscat (szPathBuffer, pExtension);
for (n = 0; n < nExtCount; n++)
{
_tcscpy (p, ext[n]);
#ifdef _DEBUG
DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
#endif
if (IsValidFileName (szPathBuffer)) if (IsValidFileName (szPathBuffer))
{ {
@ -253,81 +206,50 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
return TRUE; return TRUE;
} }
} }
}
}
else
{
/* There is an extension and it is in the last path component, */
/* so don't test all the extensions. */
#ifdef _DEBUG
DebugPrintf (_T("Filename extension!\n"));
#endif
/* search in current directory */
len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
if (szPathBuffer[len - 1] != _T('\\'))
{
szPathBuffer[len] = _T('\\');
szPathBuffer[len + 1] = _T('\0');
}
_tcscat (szPathBuffer, pFileName);
#ifdef _DEBUG
DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
#endif
if (IsValidFileName (szPathBuffer))
{
#ifdef _DEBUG
DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
#endif
free (pszBuffer); free (pszBuffer);
_tcscpy (pFullName, szPathBuffer); return FALSE;
return TRUE; }
}
BOOL
/* search in PATH */ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
s = pszBuffer; {
while (s && *s) LPTSTR pszBuffer = NULL;
{ LPTSTR pCh;
f = _tcschr (s, _T(';')); DWORD dwBuffer;
#ifdef _DEBUG
if (f) DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName);
{ #endif
_tcsncpy (szPathBuffer, s, (size_t)(f-s)); // check the filename directly
szPathBuffer[f-s] = _T('\0'); if (SearchForExecutableSingle(pFileName, pFullName, NULL))
s = f + 1; {
} return TRUE;
else }
{
_tcscpy (szPathBuffer, s); // load environment varable PATHEXT
s = NULL; pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
} dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE);
if (dwBuffer > ENV_BUFFER_SIZE)
len = _tcslen(szPathBuffer); {
if (szPathBuffer[len - 1] != _T('\\')) pszBuffer = (LPTSTR)realloc (pszBuffer, dwBuffer * sizeof (TCHAR));
{ GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, dwBuffer * sizeof (TCHAR));
szPathBuffer[len] = _T('\\'); }
szPathBuffer[len + 1] = _T('\0');
} #ifdef _DEBUG
_tcscat (szPathBuffer, pFileName); DebugPrintf (_T("SearchForExecutable(): Loaded PATHEXT: %s\n"), pszBuffer);
#endif
#ifdef _DEBUG
DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer); pCh = _tcstok(pszBuffer, ";");
#endif while (pCh)
if (IsValidFileName (szPathBuffer)) {
{ if (SearchForExecutableSingle(pFileName, pFullName, pCh))
#ifdef _DEBUG {
DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); free(pszBuffer);
#endif return TRUE;
free (pszBuffer); }
_tcscpy (pFullName, szPathBuffer); pCh = _tcstok(NULL, ";");
return TRUE; }
}
} free(pszBuffer);
}
free (pszBuffer);
return FALSE; return FALSE;
} }