Attachment 157377 Details for Bug 244864 – patch to perform speculative scan forward on * match

[patch] patch to perform speculative scan forward on * match

vsftpd-2.0.1-greedy.patch (text/plain), 1.02 KB, created by Martin Poole on 2007-06-19 15:11:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Poole

Created: 2007-06-19 15:11:15 UTC

Size: 1.02 KB

patch

obsolete

>--- vsftpd-2.0.1/ls.c.greedy	2004-07-02 12:23:34.000000000 +0100
>+++ vsftpd-2.0.1/ls.c	2007-06-19 13:25:29.000000000 +0100
>@@ -281,6 +281,24 @@ vsf_filename_passes_filter(const struct 
>       {
>         goto out;
>       }
>+      if (!must_match_at_current_pos)
>+      {
>+        struct mystr scan_fwd = INIT_MYSTR;
>+        
>+	str_mid_to_end(&name_remain_str, &scan_fwd,
>+			indexx + str_getlen(&s_match_needed_str));
>+        /* we're allowed to be greedy, test if it match further along
>+	 * keep advancing indexx while we can still match
>+	 */
>+	while( (locate_result = str_locate_str(&scan_fwd, &s_match_needed_str)),
>+	    locate_result.found )
>+	{
>+	  indexx += locate_result.index + str_getlen(&s_match_needed_str);
>+	  str_mid_to_end(&scan_fwd, &temp_str,
>+			 locate_result.index + str_getlen(&s_match_needed_str));
>+	  str_copy(&scan_fwd, &temp_str);
>+	}
>+      }
>       /* Chop matched string out of remainder */
>       str_mid_to_end(&name_remain_str, &temp_str,
>                      indexx + str_getlen(&s_match_needed_str));

Actions: View | Diff

Attachments on bug 244864: 157377