LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call log_delete() from delete_file() anytime that DEL_TERSE is

Browse Source 
not set (we used to only call if verbose or log_format were also
set).
This commit is contained in:
Wayne Davison
2005-02-26 04:50:55 +00:00
parent 41b5b5e756
commit 89d19eedef
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flist.c
View File

@@ -63,7 +63,6 @@ extern int force_delete;
extern int orig_umask; extern int orig_umask;
extern int make_backups; extern int make_backups;
extern unsigned int curr_dir_len; extern unsigned int curr_dir_len;
extern char *log_format;
extern char *backup_dir; extern char *backup_dir;
extern char *backup_suffix; extern char *backup_suffix;
extern int backup_suffix_len; extern int backup_suffix_len;
@@ -1801,7 +1800,7 @@ int delete_file(char *fname, int mode, int flags)
else else
ok = robust_unlink(fname) == 0; ok = robust_unlink(fname) == 0;
if (ok) { if (ok) {
if ((verbose || log_format) && !(flags & DEL_TERSE)) if (!(flags & DEL_TERSE))
log_delete(fname, mode); log_delete(fname, mode);
deletion_count++; deletion_count++;
return 0; return 0;
@@ -1824,7 +1823,7 @@ int delete_file(char *fname, int mode, int flags)
else else
ok = do_rmdir(fname) == 0; ok = do_rmdir(fname) == 0;
if (ok) { if (ok) {
if ((verbose || log_format) && !(flags & DEL_TERSE)) if (!(flags & DEL_TERSE))
log_delete(fname, mode); log_delete(fname, mode);
deletion_count++; deletion_count++;
return 0; return 0;
@@ -1857,7 +1856,7 @@ int delete_file(char *fname, int mode, int flags)
return -1; return -1;
if (do_rmdir(fname) == 0) { if (do_rmdir(fname) == 0) {
if ((verbose || log_format) && !(flags & DEL_TERSE)) if (!(flags & DEL_TERSE))
log_delete(fname, mode); log_delete(fname, mode);
deletion_count++; deletion_count++;
} else if (errno != ENOTEMPTY && errno != ENOENT) { } else if (errno != ENOTEMPTY && errno != ENOENT) {