25 lines
884 B
Diff
25 lines
884 B
Diff
diff -up vsftpd-2.3.2/ls.c.tmp vsftpd-2.3.2/ls.c
|
|
--- vsftpd-2.3.2/ls.c.tmp 2010-08-20 13:18:54.397583558 +0200
|
|
+++ vsftpd-2.3.2/ls.c 2010-08-20 13:14:59.047831385 +0200
|
|
@@ -305,6 +305,20 @@ vsf_filename_passes_filter(const struct
|
|
{
|
|
goto out;
|
|
}
|
|
+ if (!must_match_at_current_pos && last_token == 0)
|
|
+ {
|
|
+ struct mystr last_str = INIT_MYSTR;
|
|
+ str_mid_to_end(&name_remain_str, &last_str,
|
|
+ str_getlen(&name_remain_str) - str_getlen(&s_match_needed_str));
|
|
+ locate_result = str_locate_str(&last_str, &s_match_needed_str);
|
|
+ str_free(&last_str);
|
|
+
|
|
+ if (locate_result.found)
|
|
+ {
|
|
+ ret = 1;
|
|
+ }
|
|
+ goto out;
|
|
+ }
|
|
/* Chop matched string out of remainder */
|
|
str_mid_to_end(&name_remain_str, &temp_str,
|
|
indexx + str_getlen(&s_match_needed_str));
|