In the debug output, distinguish between a user-requested clearing

of the exclude list and the popping of the local exclude list that
occurs when we finish each subdir.

diff --git a/exclude.c b/exclude.c
index 07d24a1..01401c5 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -103,11 +103,6 @@ void free_exclude_list(struct exclude_list_struct *listp)
 {
        struct exclude_struct *ent, *next;
 
-       if (verbose > 2) {
-               rprintf(FINFO, "[%s] clearing %sexclude list\n",
-                       who_am_i(), listp->debug_type);
-       }
-
        for (ent = listp->head; ent; ent = next) {
                next = ent->next;
                free_exclude(ent);
@@ -296,9 +291,14 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern,
                if (!pat_len)
                        break;
                /* If we got the special "!" token, clear the list. */
-               if (incl < 0)
+               if (incl < 0) {
+                       if (verbose > 2) {
+                               rprintf(FINFO,
+                                       "[%s] clearing %sexclude list\n",
+                                       who_am_i(), listp->debug_type);
+                       }
                        free_exclude_list(listp);
-               else {
+               } else {
                        make_exclude(listp, cp, pat_len, incl);
 
                        if (verbose > 2) {

diff --git a/flist.c b/flist.c
index b66c19a..e905a18 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -949,6 +949,10 @@ void send_file_name(int f, struct file_list *flist, char *fname,
                struct exclude_list_struct last_list = local_exclude_list;
                local_exclude_list.head = local_exclude_list.tail = NULL;
                send_directory(f, flist, f_name_to(file, fbuf));
+               if (verbose > 2) {
+                       rprintf(FINFO, "[%s] popping %sexclude list\n",
+                               who_am_i(), local_exclude_list.debug_type);
+               }
                free_exclude_list(&local_exclude_list);
                local_exclude_list = last_list;
        }