tbaeder / rpms / vsftpd

Forked from rpms/vsftpd 3 years ago
Clone
e000aa4
From 0da42468ac9518a544aad57d22d7697d6bdfa969 Mon Sep 17 00:00:00 2001
8167548
From: Martin Sehnoutka <msehnout@redhat.com>
e000aa4
Date: Thu, 17 Nov 2016 13:25:12 +0100
Ondřej Lysoněk 7c0626d
Subject: [PATCH 31/59] Fix question mark wildcard withing a file name.
8167548
e000aa4
Previously '?' worked only at the end of a file name, now it can
e000aa4
be used anywhere.
8167548
---
8167548
 ls.c | 3 ++-
8167548
 1 file changed, 2 insertions(+), 1 deletion(-)
8167548
8167548
diff --git a/ls.c b/ls.c
e000aa4
index 3c0988c..35c15c7 100644
8167548
--- a/ls.c
8167548
+++ b/ls.c
8167548
@@ -459,7 +459,8 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str,
8167548
         must_match_at_current_pos = 0;
8167548
       }
8167548
     } while (locate_result.found &&
8167548
-             str_getlen(&name_remain_str) > 0 && last_token != '*');
8167548
+             str_getlen(&name_remain_str) > 0 &&
8167548
+             last_token != '*' && last_token != '?');
8167548
   }
8167548
   /* Any incoming string left means no match unless we ended on the correct
8167548
    * type of wildcard.
8167548
-- 
Ondřej Lysoněk 7c0626d
2.14.4
8167548