X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b66e31bf15c83904f14f9b7b40eeecaadc2971ba..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/log.c diff --git a/log.c b/log.c index f2df6000..db212300 100644 --- a/log.c +++ b/log.c @@ -1,31 +1,29 @@ -/* -*- c-file-style: "linux"; -*- - - Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2000-2001 by Martin Pool - - 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. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - /* - Logging and utility functions. - tridge, May 1998 + * Logging and utility functions. + * + * Copyright (C) 1998-2001 Andrew Tridgell + * Copyright (C) 2000-2001 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - Mapping to human-readable messages added by Martin Pool - , Oct 2000. - */ #include "rsync.h" +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include +#endif extern int verbose; extern int dry_run; @@ -36,13 +34,18 @@ extern int local_server; extern int quiet; extern int module_id; extern int msg_fd_out; +extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; extern int log_format_has_i; extern int log_format_has_o_or_i; extern int daemon_log_format_has_o_or_i; +extern mode_t orig_umask; extern char *auth_user; extern char *log_format; +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +extern iconv_t ic_chck; +#endif static int log_initialised; static int logfile_was_closed; @@ -136,8 +139,7 @@ static void syslog_init() static void logfile_open(void) { - extern int orig_umask; - int old_umask = umask(022 | orig_umask); + mode_t old_umask = umask(022 | orig_umask); logfile = fopen(logfname, "a"); umask(old_umask); if (!logfile) { @@ -189,20 +191,21 @@ void logfile_reopen(void) } } -static void filtered_fwrite(const char *buf, int len, FILE *f) +static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint) { const char *s, *end = buf + len; for (s = buf; s < end; s++) { if ((s < end - 4 - && *s == '\\' && s[1] == '0' + && *s == '\\' && s[1] == '#' && isdigit(*(uchar*)(s+2)) && isdigit(*(uchar*)(s+3)) && isdigit(*(uchar*)(s+4))) - || !isprint(*(uchar*)s) - || *(uchar*)s < ' ') { + || (*s != '\t' + && ((use_isprint && !isprint(*(uchar*)s)) + || *(uchar*)s < ' '))) { if (s != buf && fwrite(buf, s - buf, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO); - fprintf(f, "\\%04o", *(uchar*)s); + fprintf(f, "\\#%03o", *(uchar*)s); buf = s + 1; } } @@ -272,7 +275,7 @@ void rwrite(enum logcode code, char *buf, int len) case FINFO: f = am_server ? stderr : stdout; pre_scan: - while (len > 1 && (*buf == '\n' || *buf == '\t')) { + while (len > 1 && *buf == '\n') { fputc(*buf, f); buf++; len--; @@ -288,7 +291,30 @@ void rwrite(enum logcode code, char *buf, int len) trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') ? buf[--len] : 0; - filtered_fwrite(buf, len, f); +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H + if (ic_chck != (iconv_t)-1) { + char convbuf[1024]; + char *in_buf = buf, *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) { + if (out_buf != convbuf) { + filtered_fwrite(f, convbuf, out_buf - convbuf, 0); + out_buf = convbuf; + out_cnt = sizeof convbuf - 1; + } + if (errno == E2BIG) + continue; + fprintf(f, "\\#%03o", *(uchar*)in_buf++); + in_cnt--; + } + if (out_buf != convbuf) + filtered_fwrite(f, convbuf, out_buf - convbuf, 0); + } else +#endif + filtered_fwrite(f, buf, len, !allow_8bit_chars); if (trailing_CR_or_NL) { fputc(trailing_CR_or_NL, f); @@ -446,12 +472,40 @@ static void log_formatted(enum logcode code, char *format, char *op, (double)file->length); n = buf2; break; + case 'U': + strlcat(fmt, "ld", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + (long)file->uid); + n = buf2; + break; + case 'G': + if (file->gid == GID_NONE) + n = "DEFAULT"; + else { + strlcat(fmt, "ld", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + (long)file->gid); + n = buf2; + } + break; case 'p': strlcat(fmt, "ld", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, (long)getpid()); n = buf2; break; + case 'M': + n = timestring(file->modtime); + { + char *cp = n; + while ((cp = strchr(cp, ' ')) != NULL) + *cp = '-'; + } + break; + case 'B': + n = buf2 + MAXPATHLEN - PERMSTRING_SIZE; + permstring(n - 1, file->mode); /* skip the type char */ + break; case 'o': n = op; break; @@ -549,7 +603,8 @@ static void log_formatted(enum logcode code, char *format, char *op, n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; - n[8] = '\0'; + n[8] = '.'; + n[9] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; @@ -709,11 +764,11 @@ void log_exit(int code, const char *file, int line) /* VANISHED is not an error, only a warning */ if (code == RERR_VANISHED) { - rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d)\n", - name, code, file, line); + rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } else { - rprintf(FERROR, "rsync error: %s (code %d) at %s(%d)\n", - name, code, file, line); + rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } } }