mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-24 01:01:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Got rid of delete_one() since we can (and do) use the updated

Browse Source 
delete_file() call now.
This commit is contained in:
Wayne Davison
2005-01-19 20:10:53 +00:00
parent c207d7ec62
commit d336388403
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
receiver.c
View File

@@ -57,29 +57,6 @@ extern int inplace;
extern struct exclude_list_struct server_exclude_list;
static void delete_one(char *fn, int is_dir)
{
if (!is_dir) {
if (robust_unlink(fn) != 0) {
rsyserr(FERROR, errno, "delete_one: unlink %s failed",
full_fname(fn));
} else if (verbose)
rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
if (errno != ENOTEMPTY && errno != EEXIST) {
rsyserr(FERROR, errno,
"delete_one: rmdir %s failed",
full_fname(fn));
}
} else if (verbose) {
rprintf(FINFO, "deleting directory %s\n",
safe_fname(fn));
}
}
}
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
@@ -132,8 +109,10 @@ void delete_files(struct file_list *flist)
rprintf(FINFO, "deleting %s\n",
safe_fname(f));
}
} else
delete_one(f, S_ISDIR(mode) != 0);
} else {
delete_file(f, S_ISDIR(mode)
? DEL_DIR | DEL_NO_RECURSE : 0);
}
deletion_count++;
}
}