X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4a19c3b254b01c298fe25d72f450a760278e9386..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/log.c diff --git a/log.c b/log.c index c69482de..a2da7875 100644 --- a/log.c +++ b/log.c @@ -3,12 +3,11 @@ * * Copyright (C) 1998-2001 Andrew Tridgell * Copyright (C) 2000-2001 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2007 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -37,6 +36,8 @@ extern int msg_fd_out; extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; +extern int preserve_uid; +extern int preserve_gid; extern int stdout_format_has_i; extern int stdout_format_has_o_or_i; extern int logfile_format_has_i; @@ -300,15 +301,18 @@ void rwrite(enum logcode code, const char *buf, int len) ? buf[--len] : 0; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#ifndef ICONV_CONST +#define ICONV_CONST +#endif if (ic_chck != (iconv_t)-1) { char convbuf[1024]; - const char *in_buf = buf; + ICONV_CONST char *in_buf = (ICONV_CONST char *)buf; char *out_buf = convbuf; size_t in_cnt = len, out_cnt = sizeof convbuf - 1; iconv(ic_chck, NULL, 0, NULL, 0); while (iconv(ic_chck, &in_buf,&in_cnt, - &out_buf,&out_cnt) == (size_t)-1) { + &out_buf,&out_cnt) == (size_t)-1) { if (out_buf != convbuf) { filtered_fwrite(f, convbuf, out_buf - convbuf, 0); out_buf = convbuf; @@ -420,8 +424,9 @@ void rflush(enum logcode code) /* A generic logging routine for send/recv, with parameter substitiution. */ static void log_formatted(enum logcode code, const char *format, const char *op, - struct file_struct *file, struct stats *initial_stats, - int iflags, const char *hlink) + struct file_struct *file, const char *fname, + struct stats *initial_stats, int iflags, + const char *hlink) { char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32]; char *p, *s, *c; @@ -466,22 +471,22 @@ static void log_formatted(enum logcode code, const char *format, const char *op, case 'l': strlcat(fmt, ".0f", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (double)file->length); + (double)F_LENGTH(file)); n = buf2; break; case 'U': strlcat(fmt, "ld", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (long)file->uid); + preserve_uid ? (long)F_UID(file) : 0); n = buf2; break; case 'G': - if (file->gid == GID_NONE) + if (!preserve_gid || F_GID(file) == GID_NONE) n = "DEFAULT"; else { strlcat(fmt, "ld", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (long)file->gid); + (long)F_GID(file)); n = buf2; } break; @@ -505,17 +510,21 @@ static void log_formatted(enum logcode code, const char *format, const char *op, n = op; break; case 'f': - c = f_name(file, NULL); - if (am_sender && file->dir.root) { + if (fname) { + c = f_name_buf(); + strlcpy(c, fname, MAXPATHLEN); + } else + c = f_name(file, NULL); + if (am_sender && F_ROOTDIR(file)) { pathjoin(buf2, sizeof buf2, - file->dir.root, c); + F_ROOTDIR(file), c); clean_fname(buf2, 0); if (fmt[1]) { strlcpy(c, buf2, MAXPATHLEN); n = c; } else n = buf2; - } else if (*c != '/') { + } else if (am_daemon && *c != '/') { pathjoin(buf2, sizeof buf2, curr_dir + module_dirlen, c); clean_fname(buf2, 0); @@ -532,7 +541,11 @@ static void log_formatted(enum logcode code, const char *format, const char *op, n++; break; case 'n': - c = f_name(file, NULL); + if (fname) { + c = f_name_buf(); + strlcpy(c, fname, MAXPATHLEN); + } else + c = f_name(file, NULL); if (S_ISDIR(file->mode)) strlcat(c, "/", MAXPATHLEN); n = c; @@ -541,8 +554,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op, if (hlink && *hlink) { n = hlink; strlcpy(buf2, " => ", sizeof buf2); - } else if (S_ISLNK(file->mode) && file->u.link) { - n = file->u.link; + } else if (S_ISLNK(file->mode) && !fname) { + n = F_SYMLINK(file); strlcpy(buf2, " -> ", sizeof buf2); } else { n = ""; @@ -611,8 +624,10 @@ static void log_formatted(enum logcode code, const char *format, const char *op, c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; - c[8] = '.'; - c[9] = '\0'; + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u'; + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a'; + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; + c[11] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; @@ -701,11 +716,11 @@ void log_item(enum logcode code, struct file_struct *file, if (code != FLOG && stdout_format && !am_server) { log_formatted(FCLIENT, stdout_format, s_or_r, - file, initial_stats, iflags, hlink); + file, NULL, initial_stats, iflags, hlink); } if (code != FCLIENT && logfile_format && *logfile_format) { log_formatted(FLOG, logfile_format, s_or_r, - file, initial_stats, iflags, hlink); + file, NULL, initial_stats, iflags, hlink); } } @@ -729,12 +744,14 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing, void log_delete(const char *fname, int mode) { - static struct file_struct file; + static struct { + union file_extras ex[4]; /* just in case... */ + struct file_struct file; + } x; int len = strlen(fname); const char *fmt; - file.mode = mode; - file.basename = fname; + x.file.mode = mode; if (!verbose && !stdout_format) ; @@ -744,7 +761,7 @@ void log_delete(const char *fname, int mode) send_msg(MSG_DELETED, fname, len); } else { fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n"; - log_formatted(FCLIENT, fmt, "del.", &file, &stats, + log_formatted(FCLIENT, fmt, "del.", &x.file, fname, &stats, ITEM_DELETED, NULL); } @@ -752,7 +769,7 @@ void log_delete(const char *fname, int mode) return; fmt = logfile_format_has_o_or_i ? logfile_format : "deleting %n"; - log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL); + log_formatted(FLOG, fmt, "del.", &x.file, fname, &stats, ITEM_DELETED, NULL); } /*