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

        to allow checking for .lnk suffixes even if in_suffixes is empty.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 47901fcea5f7ffb8bd0ed7b89a51b3fe028fedb2..064f610f725e3a0b2c8ed1a2bf7f6f06449a7701 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,9 @@
-Tue Mar  6 13:02:00 2001  Jason Tiller <jtiller@sjm.com>
+Tue Mar  6 14:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
+
+       * path.cc (suffix_scan::has): Change order of conditionals
+       to allow checking for .lnk suffixes even if in_suffixes is empty.
+
+Tue Mar  6 13:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
        * autoload.c (cygwin_premain0): Add missing parameter.
        * binmode.c (cygwin_premain0): Ditto.

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index cf026fe826d780d6474928215e7ffccab36d5472..94111ad12e99865f673ee0041d0eacce157d0156 100644 (file)
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -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;
        }
     }