X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/19bc826d8b16a750d5826998d739692928a45103..cc3e0770bc05a6de4af75aec45e533634bb04d2d:/log.c diff --git a/log.c b/log.c index 70aa96df..b09b334c 100644 --- a/log.c +++ b/log.c @@ -27,7 +27,8 @@ */ #include "rsync.h" -extern int itemize_changes; +extern int verbose; +extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; @@ -36,6 +37,8 @@ extern int module_id; extern int msg_fd_out; extern int protocol_version; extern int preserve_times; +extern int log_format_has_o_or_i; +extern int daemon_log_format_has_o_or_i; extern char *auth_user; extern char *log_format; @@ -55,6 +58,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" }, @@ -68,8 +72,9 @@ struct { { RERR_TIMEOUT , "timeout in data send/receive" }, { RERR_CMD_FAILED , "remote shell failed" }, { RERR_CMD_KILLED , "remote shell killed" }, - { RERR_CMD_RUN, "remote command could not be run" }, - { RERR_CMD_NOTFOUND, "remote command not found" }, + { RERR_CMD_RUN , "remote command could not be run" }, + { RERR_CMD_NOTFOUND,"remote command not found" }, + { RERR_DEL_LIMIT , "the --max-delete limit stopped deletions" }, { 0, NULL } }; @@ -88,28 +93,6 @@ static char const *rerr_name(int code) return NULL; } -void log_open(void) -{ - if (logfname && !logfile) { - extern int orig_umask; - int old_umask = umask(022 | orig_umask); - logfile = fopen(logfname, "a"); - umask(old_umask); - if (!logfile) { - am_daemon = 0; /* avoid trying to log again */ - rsyserr(FERROR, errno, "fopen() of log-file failed"); - exit_cleanup(RERR_FILESELECT); - } - } -} - -void log_close(void) -{ - if (logfile) { - fclose(logfile); - logfile = NULL; - } -} static void logit(int priority, char *buf) { @@ -164,6 +147,29 @@ void log_init(void) #endif } +void log_open(void) +{ + if (logfname && !logfile) { + extern int orig_umask; + int old_umask = umask(022 | orig_umask); + logfile = fopen(logfname, "a"); + umask(old_umask); + if (!logfile) { + am_daemon = 0; /* avoid trying to log again */ + rsyserr(FERROR, errno, "fopen() of log-file failed"); + exit_cleanup(RERR_LOG_FAILURE); + } + } +} + +void log_close(void) +{ + if (logfile) { + fclose(logfile); + logfile = NULL; + } +} + /* this is the underlying (unformatted) rsync debugging function. Call * it with FINFO, FERROR or FLOG */ void rwrite(enum logcode code, char *buf, int len) @@ -185,7 +191,9 @@ void rwrite(enum logcode code, char *buf, int len) return; } - if (am_daemon) { + if (code == FCLIENT) + code = FINFO; + else if (am_daemon) { static int in_block; char msg[2048]; int priority = code == FERROR ? LOG_WARNING : LOG_INFO; @@ -339,9 +347,9 @@ void rflush(enum logcode code) /* a generic logging routine for send/recv, with parameter * substitiution */ -static void log_formatted(enum logcode code, - char *format, char *op, struct file_struct *file, - struct stats *initial_stats, int iflags) +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]; @@ -388,7 +396,11 @@ static void log_formatted(enum logcode code, } break; case 'L': - if (S_ISLNK(file->mode) && file->u.link) { + if (hlink && *hlink) { + snprintf(buf2, sizeof buf2, " => %s", + safe_fname(hlink)); + n = buf2; + } else if (S_ISLNK(file->mode) && file->u.link) { snprintf(buf2, sizeof buf2, " -> %s", safe_fname(file->u.link)); n = buf2; @@ -423,12 +435,14 @@ static void log_formatted(enum logcode code, break; case 'i': if (iflags & ITEM_DELETED) { - n = "deleting"; + n = "*deleting"; break; } n = buf2; - n[0] = !(iflags & ITEM_UPDATING) ? '.' - : *op == 's' ? '>' : '<'; + n[0] = iflags & ITEM_LOCAL_CHANGE + ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c' + : !(iflags & ITEM_TRANSFER) ? '.' + : *op == 's' ? '<' : '>'; n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D' : S_ISLNK(file->mode) ? 'L' : 'f'; @@ -440,14 +454,15 @@ static void log_formatted(enum logcode code, 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] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a'; + n[9] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; int i; for (i = 2; n[i]; i++) n[i] = ch; - } else if (!(iflags & ITEM_UPDATING)) { + } else if (!(iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))) { int i; for (i = 2; n[i]; i++) { if (n[i] != '.') @@ -456,7 +471,6 @@ static void log_formatted(enum logcode code, if (!n[i]) { for (i = 2; n[i]; i++) n[i] = ' '; - n[0] = '='; } } break; @@ -495,55 +509,59 @@ static void log_formatted(enum logcode code, rprintf(code, "%s\n", buf); } -/* log the outgoing transfer of a file */ -void log_send(struct file_struct *file, struct stats *initial_stats, int iflags) +/* log the transfer of a file */ +void log_item(struct file_struct *file, struct stats *initial_stats, + int iflags, char *hlink) { + char *s_or_r = am_sender ? "send" : "recv"; + if (lp_transfer_logging(module_id)) { - log_formatted(FLOG, lp_log_format(module_id), "send", - file, initial_stats, iflags); + log_formatted(FLOG, lp_log_format(module_id), s_or_r, + file, initial_stats, iflags, hlink); } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, "send", - file, initial_stats, iflags); + log_formatted(FINFO, log_format, s_or_r, + file, initial_stats, iflags, hlink); } } -/* log the incoming transfer of a file */ -void log_recv(struct file_struct *file, struct stats *initial_stats, int iflags) +void maybe_log_item(struct file_struct *file, int iflags, int itemizing, + char *buf) { - if (lp_transfer_logging(module_id)) { - log_formatted(FLOG, lp_log_format(module_id), "recv", - file, initial_stats, iflags); - } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, "recv", - file, initial_stats, iflags); - } + int see_item = itemizing && (iflags || verbose > 1); + if (am_server) { + if (am_daemon && !dry_run && see_item) + log_item(file, &stats, iflags, buf); + } else if (see_item || iflags & ITEM_LOCAL_CHANGE || *buf + || (S_ISDIR(file->mode) && iflags & SIGNIFICANT_ITEM_FLAGS)) + log_item(file, &stats, iflags, buf); } - void log_delete(char *fname, int mode) { static struct file_struct file; int len = strlen(fname); - enum logcode code; char *fmt; file.mode = mode; file.basename = fname; - if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { + if (!verbose && !log_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); - if (!am_daemon) - return; - fmt = lp_log_format(module_id); - code = FLOG; } else { - fmt = log_format && itemize_changes ? log_format : "%i %n"; - code = FINFO; + fmt = log_format_has_o_or_i ? log_format : "deleting %n"; + log_formatted(FCLIENT, fmt, "del.", &file, &stats, + ITEM_DELETED, NULL); } - log_formatted(code, fmt, "del.", &file, &stats, ITEM_DELETED); + if (!am_daemon || dry_run || !lp_transfer_logging(module_id)) + return; + + fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "deleting %n"; + log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL); } @@ -556,7 +574,7 @@ void log_delete(char *fname, int mode) void log_exit(int code, const char *file, int line) { if (code == 0) { - rprintf(FLOG,"wrote %.0f bytes read %.0f bytes total size %.0f\n", + rprintf(FLOG,"sent %.0f bytes received %.0f bytes total size %.0f\n", (double)stats.total_written, (double)stats.total_read, (double)stats.total_size);