X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/87fd439059f5210483e20aa0f2da2ccf106b70e7..89d19eedef185508b80b3d94e3ad848b468f8d3c:/flist.c

diff --git a/flist.c b/flist.c
index 05b53f6e..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;
@@ -963,7 +962,7 @@ skip_filters:
 			file->mode = save_mode;
 	}
 
-	if (!S_ISDIR(st.st_mode))
+	if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
 		stats.total_size += st.st_size;
 
 	return file;
@@ -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) {