Add '?' sign as a possible mark of wildcard.

Signed-off-by: Slava Zanko <[email protected]>
SokolskyNikita · Feb 25, 2015 · 4d2cefa · 4d2cefa
1 parent ec0dd74
commit 4d2cefa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c
@@ -612,7 +612,7 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode)
 static gboolean
 is_wildcarded (const char *p)
 {
-    int escaped = 0;
+    gboolean escaped = FALSE;
     for (; *p; p++)
     {
         if (*p == '\\')
@@ -623,9 +623,9 @@ is_wildcarded (const char *p)
         }
         else
         {
-            if (*p == '*' && !escaped)
+            if ((*p == '*' || *p == '?') && !escaped)
                 return TRUE;
-            escaped = 0;
+            escaped = FALSE;
         }
     }
     return FALSE;

diff --git a/tests/src/filemanager/filegui_is_wildcarded.c b/tests/src/filemanager/filegui_is_wildcarded.c
@@ -71,7 +71,7 @@ static const struct test_is_wildcarded_ds
     },
     { /* 1 */
         "bla?bla",
-        FALSE
+        TRUE
     },
     { /* 2 */
         "bla*bla",
@@ -110,6 +110,14 @@ static const struct test_is_wildcarded_ds
         "blabla\\",
         FALSE
     },
+    { /* 11 */
+        "blab\\?la",
+        FALSE
+    },
+    { /* 12 */
+        "blab\\\\?la",
+        TRUE
+    },
 };
 /* *INDENT-ON* */