system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-19 08:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: Fix 'if exist' with a directory\ as a parameter.

Browse source 
'if exists' takes a parameter which can be directory, directory\ or
directory\. for example, and should equate to true if the directory
exists. The syntax directory\ is explicitly rejected by FindFirstFile
and hence was not working - look for this specific case, and if found
append a '.'.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45506
Signed-off-by: Jason Edmeades <us@edmeades.me.uk>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jason Edmeades 2018-08-27 20:41:52 +01:00 committed by Alexandre Julliard
parent 8b6ba774c0
commit bc9d68bcbe
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
programs/cmd/builtins.c
View file

@ -2861,7 +2861,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList)
}
else if (!lstrcmpiW (condition, existW)) {
WIN32_FIND_DATAW fd;
HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd);
HANDLE hff;
WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE);
int len = strlenW(param);
/* FindFirstFile does not like a directory path ending in '\', append a '.' */
if (len && param[len-1] == '\\') strcatW(param, dotW);
hff = FindFirstFileW(param, &fd);
test = (hff != INVALID_HANDLE_VALUE );
if (test) FindClose(hff);

20
programs/cmd/tests/test_builtins.cmd
View file

@ -1046,6 +1046,26 @@ if exist idontexist\ba* (
) else (
echo exist wildcard bad subdir broken works
)
if exist subdir (
echo exist subdir ok
) else (
echo ERROR exist subdir not working
)
if exist subdir\. (
echo exist subdir with . ok
) else (
echo ERROR exist subdir with . not working
)
if exist subdir\ (
echo exist subdir with \ ok
) else (
echo ERROR exist subdir with \ not working
)
if exist "subdir\" (
echo exist subdir with \ and quotes ok
) else (
echo ERROR exist subdir with \ and quotes not working
)
del foo subdir\bar
rd subdir

4
programs/cmd/tests/test_builtins.cmd.exp
View file

@ -783,6 +783,10 @@ exist simple wildcard works
exist wildcard works
negate exist wildcard works
exist wildcard bad subdir broken works
exist subdir ok
exist subdir with . ok
exist subdir with \ ok
exist subdir with \ and quotes ok
------ for numbers
negative numbers handled
negative numbers handled