X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d5609e969d4f83360f3ece4417a62b34530b8a63..624d6be2a529114604da511dd1f3eadf509b4b9b:/log.c diff --git a/log.c b/log.c index 890d6646..c8a433db 100644 --- a/log.c +++ b/log.c @@ -32,6 +32,7 @@ extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; +extern int local_server; extern int quiet; extern int module_id; extern int msg_fd_out; @@ -58,6 +59,7 @@ struct { { RERR_FILESELECT , "errors selecting input/output files, dirs" }, { RERR_UNSUPPORTED, "requested action not supported" }, { RERR_STARTCLIENT, "error starting client-server protocol" }, + { RERR_LOG_FAILURE, "daemon unable to append to log-file" }, { RERR_SOCKETIO , "error in socket IO" }, { RERR_FILEIO , "error in file IO" }, { RERR_STREAMIO , "error in rsync protocol data stream" }, @@ -73,7 +75,7 @@ struct { { RERR_CMD_KILLED , "remote shell killed" }, { RERR_CMD_RUN , "remote command could not be run" }, { RERR_CMD_NOTFOUND,"remote command not found" }, - { RERR_DEL_LIMIT , "--max-delete limit stopped deletions" }, + { RERR_DEL_LIMIT , "the --max-delete limit stopped deletions" }, { 0, NULL } }; @@ -156,7 +158,7 @@ void log_open(void) if (!logfile) { am_daemon = 0; /* avoid trying to log again */ rsyserr(FERROR, errno, "fopen() of log-file failed"); - exit_cleanup(RERR_FILESELECT); + exit_cleanup(RERR_LOG_FAILURE); } } } @@ -350,44 +352,64 @@ static void log_formatted(enum logcode code, char *format, char *op, struct file_struct *file, struct stats *initial_stats, int iflags, char *hlink) { - char buf[MAXPATHLEN+1024]; - char buf2[MAXPATHLEN]; - char *p, *n; + char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32]; + char *p, *s, *n; size_t len, total; int64 b; + *fmt = '%'; + /* We expand % codes one by one in place in buf. We don't * copy in the terminating nul of the inserted strings, but * rather keep going until we reach the nul of the format. */ total = strlcpy(buf, format, sizeof buf); - for (p = buf; (p = strchr(p, '%')) != NULL && p[1]; ) { + for (p = buf; (p = strchr(p, '%')) != NULL; ) { + s = p++; + n = fmt + 1; + if (*p == '-') + *n++ = *p++; + while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8) + *n++ = *p++; + if (!*p) + break; + *n = '\0'; n = NULL; - switch (p[1]) { + switch (*p++) { case 'h': if (am_daemon) n = client_name(0); break; case 'a': if (am_daemon) n = client_addr(0); break; case 'l': - snprintf(buf2, sizeof buf2, "%.0f", + strlcat(fmt, ".0f", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, (double)file->length); n = buf2; break; case 'p': - snprintf(buf2, sizeof buf2, "%d", + strlcat(fmt, "d", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, (int)getpid()); n = buf2; break; case 'o': n = op; break; case 'f': - pathjoin(buf2, sizeof buf2, - am_sender && file->dir.root ? file->dir.root : "", - safe_fname(f_name(file))); - clean_fname(buf2, 0); - n = buf2; - if (*n == '/') n++; + n = safe_fname(f_name(file)); + if (am_sender && file->dir.root) { + pathjoin(buf2, sizeof buf2, + file->dir.root, n); + /* The buffer from safe_fname() has more + * room than MAXPATHLEN, so this is safe. */ + if (fmt[1]) + strcpy(n, buf2); + else + n = buf2; + } + clean_fname(n, 0); + if (*n == '/') + n++; break; case 'n': - n = (char*)safe_fname(f_name(file)); + n = safe_fname(f_name(file)); if (S_ISDIR(file->mode)) { /* The buffer from safe_fname() has more * room than MAXPATHLEN, so this is safe. */ @@ -411,6 +433,7 @@ static void log_formatted(enum logcode code, char *format, char *op, case 'P': n = lp_path(module_id); break; case 'u': n = auth_user; break; case 'b': + strlcat(fmt, ".0f", sizeof fmt); if (am_sender) { b = stats.total_written - initial_stats->total_written; @@ -418,10 +441,11 @@ static void log_formatted(enum logcode code, char *format, char *op, b = stats.total_read - initial_stats->total_read; } - snprintf(buf2, sizeof buf2, "%.0f", (double)b); + snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; case 'c': + strlcat(fmt, ".0f", sizeof fmt); if (!am_sender) { b = stats.total_written - initial_stats->total_written; @@ -429,7 +453,7 @@ static void log_formatted(enum logcode code, char *format, char *op, b = stats.total_read - initial_stats->total_read; } - snprintf(buf2, sizeof buf2, "%.0f", (double)b); + snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; case 'i': @@ -437,11 +461,11 @@ static void log_formatted(enum logcode code, char *format, char *op, n = "*deleting"; break; } - n = buf2; + n = buf2 + MAXPATHLEN - 32; n[0] = iflags & ITEM_LOCAL_CHANGE ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c' : !(iflags & ITEM_TRANSFER) ? '.' - : *op == 's' ? '>' : '<'; + : !local_server && *op == 's' ? '<' : '>'; n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D' : S_ISLNK(file->mode) ? 'L' : 'f'; @@ -475,39 +499,62 @@ static void log_formatted(enum logcode code, char *format, char *op, break; } - /* n is the string to be inserted in place of this % - * code; len is its length not including the trailing - * NUL */ - if (!n) { - p += 2; + /* "n" is the string to be inserted in place of this % code. */ + if (!n) continue; + if (n != buf2 && fmt[1]) { + strlcat(fmt, "s", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, n); + n = buf2; } - len = strlen(n); - if (len + total - 2 >= sizeof buf) { + /* Subtract the length of the escape from the string's size. */ + total -= p - s; + + if (len + total >= sizeof buf) { rprintf(FERROR, "buffer overflow expanding %%%c -- exiting\n", - p[0]); + p[-1]); exit_cleanup(RERR_MESSAGEIO); } /* Shuffle the rest of the string along to make space for n */ - if (len != 2) - memmove(p + len, p + 2, total - (p + 2 - buf) + 1); - total += len - 2; + if (len != (size_t)(p - s)) + memmove(s + len, p, total - (s - buf) + 1); + total += len; - /* Insert the contents of string "n", but NOT its nul. */ + /* Insert the contents of string "n", but NOT its null. */ if (len) - memcpy(p, n, len); + memcpy(s, n, len); /* Skip over inserted string; continue looking */ - p += len; + p = s + len; } rprintf(code, "%s\n", buf); } +int log_format_has(const char *format, char esc) +{ + const char *p; + + if (!format) + return 0; + + for (p = format; (p = strchr(p, '%')) != NULL; ) { + if (*++p == '-') + p++; + while (isdigit(*(uchar*)p)) + p++; + if (!*p) + break; + if (*p == esc) + return 1; + } + return 0; +} + /* log the transfer of a file */ void log_item(struct file_struct *file, struct stats *initial_stats, int iflags, char *hlink)