A helper file for cleanup.c.

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index 5d3ee40..397acf2 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -303,24 +303,23 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
                                merge_file);
                        return NULL;
                }
+               fn_len = strlen(fn);
        } else {
                strlcpy(fn, merge_file, len_ptr ? *len_ptr + 1 : MAXPATHLEN);
-               clean_fname(fn, 1);
+               fn_len = clean_fname(fn, 1);
        }
 
-       fn_len = strlen(fn);
-       if (fn == buf)
-               goto done;
-
-       if (dirbuf_len + fn_len >= MAXPATHLEN) {
-               rprintf(FERROR, "merge-file name overflows: %s\n", fn);
-               return NULL;
+       /* If the name isn't in buf yet, it's wasn't absolute. */
+       if (fn != buf) {
+               if (dirbuf_len + fn_len >= MAXPATHLEN) {
+                       rprintf(FERROR, "merge-file name overflows: %s\n", fn);
+                       return NULL;
+               }
+               memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
+               memcpy(buf + dirbuf_len - prefix_skip, fn, fn_len + 1);
+               fn_len = clean_fname(buf, 1);
        }
-       memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
-       memcpy(buf + dirbuf_len - prefix_skip, fn, fn_len + 1);
-       fn_len = clean_fname(buf, 1);
 
-    done:
        if (len_ptr)
                *len_ptr = fn_len;
        return buf;
@@ -907,12 +906,14 @@ void parse_rule(struct filter_list_struct *listp, const char *pattern,
                                    &pat_len, &new_mflags);
                if (!cp)
                        break;
+
+               pattern = cp + pat_len;
+
                if (pat_len >= MAXPATHLEN) {
-                       rprintf(FERROR, "discarding over-long filter: %s\n",
-                               cp);
+                       rprintf(FERROR, "discarding over-long filter: %.*s\n",
+                               (int)pat_len, cp);
                        continue;
                }
-               pattern = cp + pat_len;
 
                if (new_mflags & MATCHFLG_CLEAR_LIST) {
                        if (verbose > 2) {
@@ -932,11 +933,9 @@ void parse_rule(struct filter_list_struct *listp, const char *pattern,
                        }
                        len = pat_len;
                        if (new_mflags & MATCHFLG_EXCLUDE_SELF) {
-                               const char *name = strrchr(cp, '/');
-                               if (name)
-                                       len -= ++name - cp;
-                               else
-                                       name = cp;
+                               const char *name = cp + len;
+                               while (name > cp && name[-1] != '/') name--;
+                               len -= name - cp;
                                add_rule(listp, name, len, 0, 0);
                                new_mflags &= ~MATCHFLG_EXCLUDE_SELF;
                                len = pat_len;