From 89d19eedef185508b80b3d94e3ad848b468f8d3c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 26 Feb 2005 04:50:55 +0000 Subject: [PATCH] Call log_delete() from delete_file() anytime that DEL_TERSE is not set (we used to only call if verbose or log_format were also set). --- flist.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flist.c b/flist.c index 110c3042..e19b06ac 100644 --- a/flist.c +++ b/flist.c @@ -63,7 +63,6 @@ extern int force_delete; extern int orig_umask; extern int make_backups; extern unsigned int curr_dir_len; -extern char *log_format; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -1801,7 +1800,7 @@ int delete_file(char *fname, int mode, int flags) else ok = robust_unlink(fname) == 0; if (ok) { - if ((verbose || log_format) && !(flags & DEL_TERSE)) + if (!(flags & DEL_TERSE)) log_delete(fname, mode); deletion_count++; return 0; @@ -1824,7 +1823,7 @@ int delete_file(char *fname, int mode, int flags) else ok = do_rmdir(fname) == 0; if (ok) { - if ((verbose || log_format) && !(flags & DEL_TERSE)) + if (!(flags & DEL_TERSE)) log_delete(fname, mode); deletion_count++; return 0; @@ -1857,7 +1856,7 @@ int delete_file(char *fname, int mode, int flags) return -1; if (do_rmdir(fname) == 0) { - if ((verbose || log_format) && !(flags & DEL_TERSE)) + if (!(flags & DEL_TERSE)) log_delete(fname, mode); deletion_count++; } else if (errno != ENOTEMPTY && errno != ENOENT) { -- 2.34.1