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;
}
- 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;
struct stats *initial_stats, int iflags)
{
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 (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 ? '*'
+ n[0] = !(iflags & ITEM_UPDATING) ? '.'
: *op == 's' ? '>' : '<';
- n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D'
+ 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';
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;
}
}
+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 (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);
+ }
+
+ if (!am_daemon || dry_run)
+ 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);
+}
/*
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);