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;
int got_xfer_error = 0;
int output_needs_newline = 0;
+int send_msgs_to_gen = 0;
struct {
int code;
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);
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);
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
+ int humanize = 0;
s = p++;
c = fmt + 1;
+ while (*p == '\'') {
+ humanize++;
+ 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';
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':
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':
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':