Tweaked a variable name in flist_find().

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index dc283a1..43aa971 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -53,7 +53,7 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int relative_paths;
 extern int implied_dirs;
-extern int skip_empty_dirs;
+extern int prune_empty_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
@@ -1439,45 +1439,48 @@ static int file_compare(struct file_struct **file1, struct file_struct **file2)
 int flist_find(struct file_list *flist, struct file_struct *f)
 {
        int low = flist->low, high = flist->high;
-       int ret, mid, mid_up;
+       int diff, mid, mid_up;
 
        while (low <= high) {
                mid = (low + high) / 2;
                if (flist->files[mid]->basename)
                        mid_up = mid;
-               else if (flist->files[mid]->dir.depth) {
+               else {
+                       /* Scan for the next non-empty entry using the cached
+                        * distance values.  If the value isn't fully up-to-
+                        * date, update it. */
                        mid_up = mid + flist->files[mid]->dir.depth;
-                       if (mid_up < mid) {
-                               high = mid_up;
-                               continue;
+                       if (!flist->files[mid_up]->basename) {
+                               do {
+                                   mid_up += flist->files[mid_up]->dir.depth;
+                               } while (!flist->files[mid_up]->basename);
+                               flist->files[mid]->dir.depth = mid_up - mid;
                        }
-               } else {
-                       /* Scan for the next non-empty entry and cache
-                        * the distance so we never do this again. */
-                       mid_up = mid;
-                       while (++mid_up <= high
-                           && !flist->files[mid_up]->basename) {}
                        if (mid_up > high) {
-                               high = mid;
-                               while (--high >= low
-                                   && !flist->files[high]->basename) {}
-                               flist->files[mid]->dir.depth = high - mid;
+                               /* If there's nothing left above us, set high to
+                                * a non-empty entry below us and continue. */
+                               high = mid - flist->files[mid]->length;
+                               if (!flist->files[high]->basename) {
+                                       do {
+                                           high -= flist->files[high]->length;
+                                       } while (!flist->files[high]->basename);
+                                       flist->files[mid]->length = mid - high;
+                               }
                                continue;
                        }
-                       flist->files[mid]->dir.depth = mid_up - mid;
                }
-               ret = f_name_cmp(flist->files[mid_up], f);
-               if (ret == 0) {
+               diff = f_name_cmp(flist->files[mid_up], f);
+               if (diff == 0) {
                        if (protocol_version < 29
                            && S_ISDIR(flist->files[mid_up]->mode)
                            != S_ISDIR(f->mode))
                                return -1;
                        return mid_up;
                }
-               if (ret > 0)
-                       high = mid - 1;
-               else
+               if (diff < 0)
                        low = mid_up + 1;
+               else
+                       high = mid - 1;
        }
        return -1;
 }
@@ -1488,9 +1491,15 @@ int flist_find(struct file_list *flist, struct file_struct *f)
  */
 void clear_file(int i, struct file_list *flist)
 {
-       if (flist->hlink_pool && flist->files[i]->link_u.idev)
-               pool_free(flist->hlink_pool, 0, flist->files[i]->link_u.idev);
-       memset(flist->files[i], 0, file_struct_len);
+       struct file_struct *file = flist->files[i];
+       if (flist->hlink_pool && file->link_u.idev)
+               pool_free(flist->hlink_pool, 0, file->link_u.idev);
+       memset(file, 0, file_struct_len);
+       /* In an empty entry, dir.depth is an offset to the next non-empty
+        * entry.  Likewise for length in the opposite direction.  We assume
+        * that we're alone for now since flist_find() will collate adjacent
+        * items for any entries that are encountered during the find. */
+       file->length = file->dir.depth = 1;
 }
 
 /*
@@ -1538,6 +1547,7 @@ void flist_free(struct file_list *flist)
  */
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 {
+       char fbuf[MAXPATHLEN];
        int i, prev_i = 0;
 
        if (!flist)
@@ -1591,7 +1601,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                        if (verbose > 1 && !am_server) {
                                rprintf(FINFO,
                                        "removing duplicate name %s from file list (%d)\n",
-                                       f_name(file, NULL), drop);
+                                       f_name(file, fbuf), drop);
                        }
                        /* Make sure we don't lose track of a user-specified
                         * top directory. */
@@ -1629,7 +1639,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                }
        }
 
-       if (skip_empty_dirs && no_dups && max_dir_depth) {
+       if (prune_empty_dirs && no_dups && max_dir_depth) {
                int j, cur_depth = 0;
                int *maybe_dirs = new_array(int, max_dir_depth);
 
@@ -1646,7 +1656,12 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                                                continue;
                                        clear_file(maybe_dirs[j], flist);
                                }
-                               maybe_dirs[cur_depth] = i;
+                               if (is_excluded(f_name(file, fbuf), 1,
+                                                      ALL_FILTERS)) {
+                                       for (j = 0; j <= cur_depth; j++)
+                                               maybe_dirs[j] = -1;
+                               } else
+                                       maybe_dirs[cur_depth] = i;
                        } else if (maybe_dirs[cur_depth] >= 0) {
                                for (j = 0; j <= cur_depth; j++)
                                        maybe_dirs[j] = -1;