Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The "recurse" value is back to being just 1 or 0 (true or false).
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
412cae2
..
890d664
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-434,12
+434,12
@@
static void log_formatted(enum logcode code, char *format, char *op,
break;
case 'i':
if (iflags & ITEM_DELETED) {
break;
case 'i':
if (iflags & ITEM_DELETED) {
- n = "deleting";
+ n = "
*
deleting";
break;
}
n = buf2;
break;
}
n = buf2;
- n[0] = iflags & ITEM_
HARD_LINKED ? 'h'
-
: iflags & ITEM_LOCAL_CHANGE ?
'c'
+ n[0] = iflags & ITEM_
LOCAL_CHANGE
+
? iflags & ITEM_XNAME_FOLLOWS ? 'h' :
'c'
: !(iflags & ITEM_TRANSFER) ? '.'
: *op == 's' ? '>' : '<';
n[1] = S_ISDIR(file->mode) ? 'd'
: !(iflags & ITEM_TRANSFER) ? '.'
: *op == 's' ? '>' : '<';
n[1] = S_ISDIR(file->mode) ? 'd'
@@
-470,8
+470,6
@@
static void log_formatted(enum logcode code, char *format, char *op,
if (!n[i]) {
for (i = 2; n[i]; i++)
n[i] = ' ';
if (!n[i]) {
for (i = 2; n[i]; i++)
n[i] = ' ';
- if (n[0] == '.')
- n[0] = '=';
}
}
break;
}
}
break;
@@
-553,7
+551,7
@@
void log_delete(char *fname, int mode)
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
} else {
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
} else {
- fmt = log_format_has_o_or_i ? log_format : "
%i
%n";
+ fmt = log_format_has_o_or_i ? log_format : "
deleting
%n";
log_formatted(FCLIENT, fmt, "del.", &file, &stats,
ITEM_DELETED, NULL);
}
log_formatted(FCLIENT, fmt, "del.", &file, &stats,
ITEM_DELETED, NULL);
}
@@
-561,7
+559,7
@@
void log_delete(char *fname, int mode)
if (!am_daemon || dry_run || !lp_transfer_logging(module_id))
return;
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";
+ 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);
}
log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL);
}