X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1bad11c759e6bac2ca7339f44fc1008daa869317..564ef546a92a7588dcd0399c29dfb3914d36435d:/flist.c diff --git a/flist.c b/flist.c index 0f2f9d08..4334076a 100644 --- a/flist.c +++ b/flist.c @@ -1767,6 +1767,8 @@ struct file_list *get_dirlist(const char *dirname, int ignore_filter_rules) send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen); recurse = save_recurse; + clean_flist(dirlist, 0, 0); + return dirlist; } @@ -1816,7 +1818,7 @@ int delete_file(char *fname, int mode, int flags) ok = 0; errno = ENOTEMPTY; } else if (make_backups && !backup_dir && !is_backup_file(fname) - && !zap_dir) + && !(flags & DEL_FORCE_RECURSE)) ok = make_backup(fname); else ok = do_rmdir(fname) == 0; @@ -1833,9 +1835,10 @@ int delete_file(char *fname, int mode, int flags) full_fname(fname)); return -1; } + flags |= DEL_FORCE_RECURSE; dirlist = get_dirlist(fname, 0); - for (j = 0; j < dirlist->count; j++) { + for (j = dirlist->count; j--; ) { struct file_struct *fp = dirlist->files[j]; f_name_to(fp, buf); if (delete_file(buf, fp->mode, flags & ~DEL_TERSE) != 0) { @@ -1882,8 +1885,7 @@ static void delete_missing(struct file_list *full_list, if (flist_find(full_list, dir_list->files[i]) < 0) { char *fn = f_name_to(dir_list->files[i], fbuf); int mode = dir_list->files[i]->mode; - int dflag = S_ISDIR(mode) ? DEL_FORCE_RECURSE : 0; - if (delete_file(fn, mode, dflag) < 0) + if (delete_file(fn, mode, DEL_FORCE_RECURSE) < 0) break; } } @@ -1945,6 +1947,8 @@ void delete_in_dir(struct file_list *flist, char *fbuf, recurse = -1; fbuf[dlen] = '\0'; + clean_flist(dir_list, 0, 0); + if (verbose > 3) output_flist(dir_list, "delete");