diff options
| author | Wayne Davison <wayned@samba.org> | 2007-07-07 20:43:14 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-07-07 20:43:14 +0000 |
| commit | 4635fb999533026387435ef1bdfe734a67cfa50c (patch) | |
| tree | 682f6337fe78e408b34f0023234a857ecfd11804 /flist.c | |
| parent | 9decb4d2ef51599425f12a68dbeba2b4f3a2d908 (diff) | |
| download | android_external_rsync-4635fb999533026387435ef1bdfe734a67cfa50c.tar.gz android_external_rsync-4635fb999533026387435ef1bdfe734a67cfa50c.tar.bz2 android_external_rsync-4635fb999533026387435ef1bdfe734a67cfa50c.zip | |
Avoid the prune-empty-dir code when cleaning a file list created
by get_dirlist().
Diffstat (limited to 'flist.c')
| -rw-r--r-- | flist.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2615,6 +2615,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) char dirbuf[MAXPATHLEN]; int save_recurse = recurse; int save_xfer_dirs = xfer_dirs; + int save_prune_empty_dirs = prune_empty_dirs; if (dlen < 0) { dlen = strlcpy(dirbuf, dirname, MAXPATHLEN); @@ -2633,8 +2634,10 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) if (do_progress) flist_count_offset += dirlist->used; + prune_empty_dirs = 0; dirlist->sorted = dirlist->files; clean_flist(dirlist, 0); + prune_empty_dirs = save_prune_empty_dirs; if (verbose > 3) output_flist(dirlist); |