mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-29 09:11:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved deletion_count here so that we honor --max-delete in

Browse Source 
delete_file().
This commit is contained in:
Wayne Davison
2005-02-19 23:24:41 +00:00
parent 8174bc3506
commit 40cc28516d
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rsync.c
View File

@@ -36,6 +36,7 @@ extern int preserve_gid;
extern int force_delete;
extern int inplace;
extern int recurse;
extern int max_delete;
extern int keep_dirlinks;
extern int make_backups;
extern struct stats stats;
@@ -53,6 +54,8 @@ void free_sums(struct sum_struct *s)
}
int deletion_count = 0; /* used to implement --max-delete */
/*
* delete a file or directory. If force_delete is set then delete
* recursively
@@ -65,10 +68,14 @@ int delete_file(char *fname, int mode, int flags)
STRUCT_STAT st;
int zap_dir;
if (max_delete && deletion_count >= max_delete)
return -1;
if (!S_ISDIR(mode)) {
if (robust_unlink(fname) == 0) {
if ((verbose || log_format) && !(flags & DEL_TERSE))
log_delete(fname, mode);
deletion_count++;
return 0;
}
if (errno == ENOENT)
@@ -85,6 +92,7 @@ int delete_file(char *fname, int mode, int flags)
else if (do_rmdir(fname) == 0) {
if ((verbose || log_format) && !(flags & DEL_TERSE))
log_delete(fname, mode);
deletion_count++;
return 0;
}
if (errno == ENOENT)
@@ -133,11 +141,14 @@ int delete_file(char *fname, int mode, int flags)
closedir(d);
if (max_delete && deletion_count >= max_delete)
return -1;
if (do_rmdir(fname) != 0 && errno != ENOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
}
deletion_count++;
return 0;
}