|
 |
d83721 |
diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c
|
|
|
d83721 |
--- vsftpd-2.1.0/ls.c.filter 2008-02-02 02:30:41.000000000 +0100
|
|
|
d83721 |
+++ vsftpd-2.1.0/ls.c 2009-01-08 19:31:15.000000000 +0100
|
|
|
d83721 |
@@ -239,9 +239,31 @@ vsf_filename_passes_filter(const struct
|
|
|
d83721 |
int ret = 0;
|
|
|
d83721 |
char last_token = 0;
|
|
|
d83721 |
int must_match_at_current_pos = 1;
|
|
|
d83721 |
+
|
|
|
d83721 |
+
|
|
|
d83721 |
str_copy(&filter_remain_str, p_filter_str);
|
|
|
d83721 |
- str_copy(&name_remain_str, p_filename_str);
|
|
|
d83721 |
-
|
|
|
d83721 |
+
|
|
|
d83721 |
+ if (!str_isempty (&filter_remain_str) && !str_isempty(p_filename_str)) {
|
|
|
d83721 |
+ if (str_get_char_at(p_filter_str, 0) == '/') {
|
|
|
d83721 |
+ if (str_get_char_at(p_filename_str, 0) != '/') {
|
|
|
d83721 |
+ str_getcwd (&name_remain_str);
|
|
|
d83721 |
+
|
|
|
d83721 |
+ if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
|
|
|
d83721 |
+ str_append_char (&name_remain_str, '/');
|
|
|
d83721 |
+
|
|
|
d83721 |
+ str_append_str (&name_remain_str, p_filename_str);
|
|
|
d83721 |
+ }
|
|
|
d83721 |
+ else
|
|
|
d83721 |
+ str_copy (&name_remain_str, p_filename_str);
|
|
|
d83721 |
+ } else {
|
|
|
d83721 |
+ if (str_get_char_at(p_filter_str, 0) != '{')
|
|
|
d83721 |
+ str_basename (&name_remain_str, p_filename_str);
|
|
|
d83721 |
+ else
|
|
|
d83721 |
+ str_copy (&name_remain_str, p_filename_str);
|
|
|
d83721 |
+ }
|
|
|
d83721 |
+ } else
|
|
|
d83721 |
+ str_copy(&name_remain_str, p_filename_str);
|
|
|
d83721 |
+
|
|
|
d83721 |
while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
|
|
|
d83721 |
{
|
|
|
d83721 |
static struct mystr s_match_needed_str;
|
|
|
d83721 |
diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c
|
|
|
d83721 |
--- vsftpd-2.1.0/str.c.filter 2008-12-17 06:54:16.000000000 +0100
|
|
|
d83721 |
+++ vsftpd-2.1.0/str.c 2009-01-08 19:31:15.000000000 +0100
|
|
|
d83721 |
@@ -680,3 +680,14 @@ str_replace_unprintable(struct mystr* p_
|
|
|
d83721 |
}
|
|
|
d83721 |
}
|
|
|
d83721 |
|
|
|
d83721 |
+void
|
|
|
d83721 |
+str_basename (struct mystr* d_str, const struct mystr* path)
|
|
|
d83721 |
+{
|
|
|
d83721 |
+ static struct mystr tmp;
|
|
|
d83721 |
+
|
|
|
d83721 |
+ str_copy (&tmp, path);
|
|
|
d83721 |
+ str_split_char_reverse(&tmp, d_str, '/');
|
|
|
d83721 |
+
|
|
|
d83721 |
+ if (str_isempty(d_str))
|
|
|
d83721 |
+ str_copy (d_str, path);
|
|
|
d83721 |
+}
|
|
|
d83721 |
diff -up vsftpd-2.1.0/str.h.filter vsftpd-2.1.0/str.h
|
|
|
d83721 |
--- vsftpd-2.1.0/str.h.filter 2008-12-17 06:53:23.000000000 +0100
|
|
|
d83721 |
+++ vsftpd-2.1.0/str.h 2009-01-08 19:32:14.000000000 +0100
|
|
|
d83721 |
@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
|
|
|
d83721 |
int str_atoi(const struct mystr* p_str);
|
|
|
d83721 |
filesize_t str_a_to_filesize_t(const struct mystr* p_str);
|
|
|
d83721 |
unsigned int str_octal_to_uint(const struct mystr* p_str);
|
|
|
d83721 |
+void str_basename (struct mystr* d_str, const struct mystr* path);
|
|
|
d83721 |
|
|
|
d83721 |
/* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string
|
|
|
d83721 |
* buffer, starting at character position 'p_pos'. The extracted line will
|