JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* path.cc (suffix_scan::has): Change order of conditionals

Browse Source 
to allow checking for .lnk suffixes even if in_suffixes is empty.
This commit is contained in:
Corinna Vinschen
2001-03-06 13:05:56 +00:00
parent 7cdc9feea1
commit bf11a54f54
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/path.cc
View File

@ -2426,10 +2426,10 @@ suffix_scan::has (const char *in_path, const suffix_info *in_suffixes, char **ex
suffixes = in_suffixes;
nullterm = 0;
state = SCAN_BEG;
if (suffixes)
ext_here = *ext_where = strrchr (in_path, '.');
if (ext_here)
{
ext_here = *ext_where = strrchr (in_path, '.');
if (ext_here)
if (suffixes)
{
/* Check if the extension matches a known extension */
for (const suffix_info *ex = in_suffixes; ex->name != NULL; ex++)
@ -2438,12 +2438,12 @@ suffix_scan::has (const char *in_path, const suffix_info *in_suffixes, char **ex
state = SCAN_JUSTCHECK;
goto known_suffix;
}
/* Didn't match. Use last resort -- .lnk. */
if (strcasematch (ext_here, ".lnk"))
{
state = SCAN_LNK;
goto known_suffix;
}
}
/* Didn't match. Use last resort -- .lnk. */
if (strcasematch (ext_here, ".lnk"))
{
state = SCAN_LNK;
goto known_suffix;
}
}