X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9468cf796daf9824070acea5fa0ec0f34f393d25..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/log.c

diff --git a/log.c b/log.c
index e06cc7da..f4808384 100644
--- a/log.c
+++ b/log.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@ extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int logfile_format_has_i;
 extern int logfile_format_has_o_or_i;
+extern int receiver_symlink_times;
 extern mode_t orig_umask;
 extern char *auth_user;
 extern char *stdout_format;
@@ -623,7 +624,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			break;
 		case 'i':
 			if (iflags & ITEM_DELETED) {
-				n = "*deleting";
+				n = "*deleting  ";
 				break;
 			}
 			n  = c = buf2 + MAXPATHLEN - 32;
@@ -638,7 +639,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			c[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
 			c[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
 			c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
-			     : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
+			     : !preserve_times || (!receiver_symlink_times && S_ISLNK(file->mode))
+			     ? 'T' : 't';
 			c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
 			c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
 			c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';