system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 00:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for an empty string in DOSFS_FindNextEx to avoid an unnecessary

Browse source 
failure.
This commit is contained in:
György 'Nog' Jeney 2002-09-27 22:03:44 +00:00 committed by Alexandre Julliard
parent e65eb61419
commit 4610c0a902
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
files/dos_fs.c
View file

@ -197,6 +197,8 @@ BOOL DOSFS_ToDosFCBFormat( LPCWSTR name, LPWSTR buffer )
LPCWSTR p = name;
int i;
TRACE("(%s, %p)\n", debugstr_w(name), buffer);
/* Check for "." and ".." */
if (*p == '.')
{
@ -342,6 +344,8 @@ static int DOSFS_MatchLong( LPCWSTR mask, LPCWSTR name, int case_sensitive )
LPCWSTR next_to_retry = NULL;
static const WCHAR asterisk_dot_asterisk[] = {'*','.','*',0};
TRACE("(%s, %s, %x)\n", debugstr_w(mask), debugstr_w(name), case_sensitive);
if (!strcmpW( mask, asterisk_dot_asterisk )) return 1;
while (*name && *mask)
{
@ -605,6 +609,9 @@ static BOOL DOSFS_ReadDir( DOS_DIR *dir, LPCWSTR *long_name,
*short_name = NULL;
dir->used += (strlenW(sn) + 1) * sizeof(WCHAR);
TRACE("Read: long_name: %s, short_name: %s\n",
debugstr_w(*long_name), debugstr_w(*short_name));
return TRUE;
}
@ -1736,7 +1743,7 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAW *entry )
/* Check the long mask */
if (info->long_mask)
if (info->long_mask && *info->long_mask)
{
if (!DOSFS_MatchLong( info->long_mask, long_name,
flags & DRIVE_CASE_SENSITIVE )) continue;
@ -1824,6 +1831,10 @@ int DOSFS_FindNext( const char *path, const char *short_mask,
UNICODE_STRING short_maskW, long_maskW;
WIN32_FIND_DATAW entryW;
TRACE("(%s, %s, %s, %x, %x, %x, %p)\n", debugstr_a(path),
debugstr_a(short_mask), debugstr_a(long_mask), drive, attr, skip,
entry);
_EnterWin16Lock();
RtlCreateUnicodeStringFromAsciiz(&short_maskW, short_mask);