*/
#include "rsync.h"
+extern int verbose;
extern int dry_run;
extern int am_daemon;
extern int am_server;
extern int quiet;
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;
return NULL;
}
-static 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);
- }
- }
-}
static void logit(int priority, char *buf)
{
#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_FILESELECT);
+ }
+ }
+}
+
void log_close(void)
{
if (logfile) {
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;
/* 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[1024];
+ char buf2[MAXPATHLEN];
char *p, *n;
size_t len, total;
int64 b;
break;
case 'n':
n = (char*)safe_fname(f_name(file));
+ if (S_ISDIR(file->mode)) {
+ /* The buffer from safe_fname() has more
+ * room than MAXPATHLEN, so this is safe. */
+ strcat(n, "/");
+ }
break;
case 'L':
- if (S_ISLNK(file->mode)) {
+ 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;
n = buf2;
break;
case 'i':
+ if (iflags & ITEM_DELETED) {
+ n = "deleting";
+ break;
+ }
n = buf2;
- n[0] = !(iflags & ITEM_UPDATING) ? ' ' : dry_run
- ? '*' : *op == 's' ? '>' : '<';
- n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D'
+ n[0] = !(iflags & ITEM_UPDATING) ? '.'
+ : *op == 's' ? '>' : '<';
+ n[1] = S_ISDIR(file->mode) ? 'd'
+ : IS_DEVICE(file->mode) ? 'D'
: S_ISLNK(file->mode) ? 'L' : 'f';
- n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '-' : 'c';
- n[3] = !(iflags & ITEM_REPORT_SIZE) ? '-' : 's';
- n[4] = !(iflags & ITEM_REPORT_TIME) ? '-'
+ n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
+ n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
+ n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
: !preserve_times || IS_DEVICE(file->mode)
|| S_ISLNK(file->mode) ? 'T' : 't';
- 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[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+ n[8] = '.';
+ 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)) {
+ int i;
+ for (i = 2; n[i]; i++) {
+ if (n[i] != '.')
+ break;
+ }
+ if (!n[i]) {
+ for (i = 2; n[i]; i++)
+ n[i] = ' ';
+ n[0] = '=';
+ }
}
break;
}
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_UPDATING || *buf
+ || (S_ISDIR(file->mode) && iflags & ITEM_REPORT_TIME))
+ log_item(file, &stats, iflags, buf);
}
+void log_delete(char *fname, int mode)
+{
+ static struct file_struct file;
+ int len = strlen(fname);
+ char *fmt;
+
+ file.mode = mode;
+ file.basename = fname;
+
+ 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);
+ } else {
+ fmt = log_format_has_o_or_i ? log_format : "%i %n";
+ log_formatted(FCLIENT, fmt, "del.", &file, &stats,
+ ITEM_DELETED, NULL);
+ }
+
+ if (!am_daemon || dry_run || !lp_transfer_logging(module_id))
+ return;
+ fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";
+ log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL);
+}
/*
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);