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
Fixed a couple iconv loops to properly handle incomplete chars
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
adde3c8
..
61d01ce
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-31,7
+31,6
@@
extern int am_generator;
extern int local_server;
extern int quiet;
extern int module_id;
extern int local_server;
extern int quiet;
extern int module_id;
-extern int msg_fd_out;
extern int checksum_len;
extern int allow_8bit_chars;
extern int protocol_version;
extern int checksum_len;
extern int allow_8bit_chars;
extern int protocol_version;
@@
-69,6
+68,7
@@
struct stats stats;
int got_xfer_error = 0;
int output_needs_newline = 0;
int got_xfer_error = 0;
int output_needs_newline = 0;
+int send_msgs_to_gen = 0;
struct {
int code;
struct {
int code;
@@
-263,7
+263,7
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
if (msgs2stderr && code != FLOG)
goto output_msg;
if (msgs2stderr && code != FLOG)
goto output_msg;
- if (
am_server && msg_fd_out >= 0
) {
+ if (
send_msgs_to_gen
) {
assert(!is_utf8);
/* Pass the message to our sibling in native charset. */
send_msg((enum msgcode)code, buf, len, 0);
assert(!is_utf8);
/* Pass the message to our sibling in native charset. */
send_msg((enum msgcode)code, buf, len, 0);
@@
-359,7
+359,7
@@
output_msg:
INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
while (inbuf.len) {
INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
while (inbuf.len) {
- iconvbufs(ic, &inbuf, &outbuf,
0
);
+ iconvbufs(ic, &inbuf, &outbuf,
inbuf.pos ? 0 : ICB_INIT
);
ierrno = errno;
if (outbuf.len) {
filtered_fwrite(f, convbuf, outbuf.len, 0);
ierrno = errno;
if (outbuf.len) {
filtered_fwrite(f, convbuf, outbuf.len, 0);
@@
-493,12
+493,21
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
+ int humanize = 0;
s = p++;
c = fmt + 1;
s = p++;
c = fmt + 1;
+ while (*p == '\'') {
+ humanize++;
+ p++;
+ }
if (*p == '-')
*c++ = *p++;
while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
*c++ = *p++;
if (*p == '-')
*c++ = *p++;
while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
*c++ = *p++;
+ while (*p == '\'') {
+ humanize++;
+ p++;
+ }
if (!*p)
break;
*c = '\0';
if (!*p)
break;
*c = '\0';
@@
-522,7
+531,7
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
case 'l':
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
case 'l':
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
-
comma_num(F_LENGTH(file)
));
+
do_big_num(F_LENGTH(file), humanize, NULL
));
n = buf2;
break;
case 'U':
n = buf2;
break;
case 'U':
@@
-639,7
+648,8
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, comma_num(b));
+ snprintf(buf2, sizeof buf2, fmt,
+ do_big_num(b, humanize, NULL));
n = buf2;
break;
case 'c':
n = buf2;
break;
case 'c':
@@
-651,7
+661,8
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, comma_num(b));
+ snprintf(buf2, sizeof buf2, fmt,
+ do_big_num(b, humanize, NULL));
n = buf2;
break;
case 'C':
n = buf2;
break;
case 'C':