X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/46f800e8c7021189e4655d3d4fe767911de2cf7e..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/log.c diff --git a/log.c b/log.c index c7007dbb..f4808384 100644 --- a/log.c +++ b/log.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998-2001 Andrew Tridgell * Copyright (C) 2000-2001 Martin Pool - * 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; @@ -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';