X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4a19c3b254b01c298fe25d72f450a760278e9386..8e41b68e8f975c02a5d9281be780ba5d1a385107:/log.c diff --git a/log.c b/log.c index c69482de..06b5ae37 100644 --- a/log.c +++ b/log.c @@ -3,11 +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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,20 +16,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H -#include -#endif extern int verbose; extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; +extern int am_generator; extern int local_server; extern int quiet; extern int module_id; @@ -37,6 +34,8 @@ extern int msg_fd_out; extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; +extern int uid_ndx; +extern int gid_ndx; extern int stdout_format_has_i; extern int stdout_format_has_o_or_i; extern int logfile_format_has_i; @@ -46,10 +45,14 @@ extern char *auth_user; extern char *stdout_format; extern char *logfile_format; extern char *logfile_name; -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#ifdef ICONV_CONST extern iconv_t ic_chck; #endif +#ifdef ICONV_OPTION +extern iconv_t ic_send, ic_recv; +#endif extern char curr_dir[]; +extern char *module_dir; extern unsigned int module_dirlen; static int log_initialised; @@ -233,17 +236,25 @@ static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint) /* this is the underlying (unformatted) rsync debugging function. Call * it with FINFO, FERROR or FLOG. Note: recursion can happen with * certain fatal conditions. */ -void rwrite(enum logcode code, const char *buf, int len) +void rwrite(enum logcode code, const char *buf, int len, int is_utf8) { int trailing_CR_or_NL; FILE *f = NULL; +#ifdef ICONV_OPTION + iconv_t ic = is_utf8 && ic_recv != (iconv_t)-1 ? ic_recv : ic_chck; +#else +#ifdef ICONV_CONST + iconv_t ic = ic_chck; +#endif +#endif if (len < 0) exit_cleanup(RERR_MESSAGEIO); if (am_server && msg_fd_out >= 0) { + assert(!is_utf8); /* Pass the message to our sibling. */ - send_msg((enum msgcode)code, buf, len); + send_msg((enum msgcode)code, buf, len, 0); return; } @@ -276,7 +287,7 @@ void rwrite(enum logcode code, const char *buf, int len) if (am_server) { /* Pass the message to the non-server side. */ - if (send_msg((enum msgcode)code, buf, len)) + if (send_msg((enum msgcode)code, buf, len, !is_utf8)) return; if (am_daemon) { /* TODO: can we send the error to the user somehow? */ @@ -299,16 +310,16 @@ void rwrite(enum logcode code, const char *buf, int len) trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') ? buf[--len] : 0; -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H - if (ic_chck != (iconv_t)-1) { +#ifdef ICONV_CONST + if (ic != (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) { + iconv(ic, NULL, 0, NULL, 0); + while (iconv(ic, &in_buf,&in_cnt, + &out_buf,&out_cnt) == (size_t)-1) { if (out_buf != convbuf) { filtered_fwrite(f, convbuf, out_buf - convbuf, 0); out_buf = convbuf; @@ -369,7 +380,7 @@ void rprintf(enum logcode code, const char *format, ...) } } - rwrite(code, buf, len); + rwrite(code, buf, len, 0); } /* This is like rprintf, but it also tries to print some @@ -400,7 +411,7 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...) if (len >= sizeof buf) exit_cleanup(RERR_MESSAGEIO); - rwrite(code, buf, len); + rwrite(code, buf, len, 0); } void rflush(enum logcode code) @@ -420,8 +431,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 +478,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); + strlcat(fmt, "u", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (long)file->uid); + uid_ndx ? F_OWNER(file) : 0); n = buf2; break; case 'G': - if (file->gid == GID_NONE) + if (!gid_ndx || file->flags & FLAG_SKIP_GROUP) n = "DEFAULT"; else { - strlcat(fmt, "ld", sizeof fmt); + strlcat(fmt, "u", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (long)file->gid); + F_GROUP(file)); n = buf2; } break; @@ -505,17 +517,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_PATHNAME(file)) { pathjoin(buf2, sizeof buf2, - file->dir.root, c); + F_PATHNAME(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 +548,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 +561,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 = ""; @@ -561,7 +581,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, n = timestring(time(NULL)); break; case 'P': - n = lp_path(module_id); + n = module_dir; break; case 'u': n = auth_user; @@ -611,8 +631,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 ? '+' : '?'; @@ -666,7 +688,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, p = s + len; } - rwrite(code, buf, total); + rwrite(code, buf, total, 0); } /* Return 1 if the format escape is in the log-format string (e.g. look for @@ -701,11 +723,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,22 +751,24 @@ 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) ; else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { if (S_ISDIR(mode)) len++; /* directories include trailing null */ - send_msg(MSG_DELETED, fname, len); + send_msg(MSG_DELETED, fname, len, am_generator); } 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 +776,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); } /*