mirror of
https://github.com/reactos/reactos.git
synced 2025-01-02 12:32:47 +00:00
fix pattern matching
svn path=/trunk/; revision=15595
This commit is contained in:
parent
7717d6cb1a
commit
60f7fbe06e
1 changed files with 5 additions and 4 deletions
|
@ -2562,15 +2562,16 @@ static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_fl
|
||||||
(entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0')))
|
(entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0')))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (pattern)
|
|
||||||
if (!pattern_match(entry->data.cFileName, pattern))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* filter directories in right pane */
|
/* filter directories in right pane */
|
||||||
if (!pane->treePane && !(filter_flags&TF_DIRECTORIES))
|
if (!pane->treePane && !(filter_flags&TF_DIRECTORIES))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* filter using the file name pattern */
|
||||||
|
if (pattern)
|
||||||
|
if (!pattern_match(entry->data.cFileName, pattern))
|
||||||
|
continue;
|
||||||
|
|
||||||
/* filter system and hidden files */
|
/* filter system and hidden files */
|
||||||
if (!(filter_flags&TF_HIDDEN) && (entry->data.dwFileAttributes&(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM)))
|
if (!(filter_flags&TF_HIDDEN) && (entry->data.dwFileAttributes&(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM)))
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in a new issue