DEVEL15-windows-dir-search-star-dot-pattern-20080916

LICENSE MIT

Replicate the FAT and NTFS behavior that the "*." pattern should match
all files without an extension.

(cherry picked from commit c4117f6f07b92fcc3a135badb48099a01ba41fe2)

diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c
index f46c326a7bf3a7b7f8af7cf3595e1a7a325c9e76..89e8c9b22ee5bc8077c87ab6d9d4f851e2f58087 100644 (file)
--- a/src/WINNT/afsd/cm_utils.c
+++ b/src/WINNT/afsd/cm_utils.c
@@ -657,6 +657,14 @@ szWildCardMatchFileName(clientchar_t * pattern, clientchar_t * name, int casefol
                                             cm_ClientCharNext(p), FALSE))
                     return TRUE;
             } /* endfor */
+            if (*pattern == '.' && *pattern_next == '\0') {
+                for (p = name; p && *p; p = cm_ClientCharNext(p))
+                    if (*p == '.')
+                        break;
+                if (p && *p)
+                    return FALSE;
+                return TRUE;
+            }
             return FALSE;
 
         default:
@@ -681,8 +689,9 @@ szWildCardMatchFileName(clientchar_t * pattern, clientchar_t * name, int casefol
  */
 int cm_MatchMask(clientchar_t *namep, clientchar_t *maskp, int flags) 
 {
-    clientchar_t * newmask;
-    int    i, j, star, qmark, casefold, retval;
+    clientchar_t *newmask, lastchar = _C('\0');
+    int    i, j, casefold, retval;
+    int  star = 0, qmark = 0, dot = 0;
 
     /* make sure we only match 8.3 names, if requested */
     if ((flags & CM_FLAG_8DOT3) && !cm_Is8Dot3(namep)) 
@@ -695,8 +704,9 @@ int cm_MatchMask(clientchar_t *namep, clientchar_t *maskp, int flags)
      * for example  the sequence "*?*?*?*"
      * must be turned into the form "*"
      */
-    newmask = (clientchar_t *)malloc((cm_ClientStrLen(maskp)+1)*sizeof(clientchar_t));
+    newmask = (clientchar_t *)malloc((cm_ClientStrLen(maskp)+2)*sizeof(clientchar_t));
     for ( i=0, j=0, star=0, qmark=0; maskp[i]; i++) {
+        lastchar = maskp[i];
         switch ( maskp[i] ) {
         case '?':
         case '>':
@@ -706,6 +716,9 @@ int cm_MatchMask(clientchar_t *namep, clientchar_t *maskp, int flags)
         case '*':
             star++;
             break;
+        case '.':
+            dot++;
+            /* fallthrough */
         default:
             if ( star ) {
                 newmask[j++] = '*';
@@ -724,6 +737,8 @@ int cm_MatchMask(clientchar_t *namep, clientchar_t *maskp, int flags)
         while ( qmark-- )
             newmask[j++] = '?';
     }
+    if (dot == 0 && lastchar == '<')
+        newmask[j++] = '.';
     newmask[j++] = '\0';
 
     retval = szWildCardMatchFileName(newmask, namep, casefold) ? 1:0;