X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a86179f42976df985508d9166591eb75d8142476..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/io.c diff --git a/io.c b/io.c index 4469c54a..38386b69 100644 --- a/io.c +++ b/io.c @@ -41,14 +41,17 @@ static int io_multiplexing_out; static int io_multiplexing_in; -static int multiplex_in_fd; -static int multiplex_out_fd; +static int multiplex_in_fd = -1; +static int multiplex_out_fd = -1; static time_t last_io; static int no_flush; extern int bwlimit; extern int verbose; extern int io_timeout; +extern int am_server; +extern int am_daemon; +extern int am_sender; extern struct stats stats; @@ -74,19 +77,56 @@ const char *io_read_phase = phase_unknown; version is 24 or less. */ int kludge_around_eof = False; +int msg_fd_in = -1; +int msg_fd_out = -1; -static int io_error_fd = -1; +static int io_filesfrom_f_in = -1; +static int io_filesfrom_f_out = -1; +static char io_filesfrom_buf[2048]; +static char *io_filesfrom_bp; +static char io_filesfrom_lastchar; +static int io_filesfrom_buflen; static void read_loop(int fd, char *buf, size_t len); +struct redo_list { + struct redo_list *next; + int num; +}; + +static struct redo_list *redo_list_head; +static struct redo_list *redo_list_tail; + +struct msg_list { + struct msg_list *next; + char *buf; + int len; +}; + +static struct msg_list *msg_list_head; +static struct msg_list *msg_list_tail; + +static void redo_list_add(int num) +{ + struct redo_list *rl; + + if (!(rl = new(struct redo_list))) + exit_cleanup(RERR_MALLOC); + rl->next = NULL; + rl->num = num; + if (redo_list_tail) + redo_list_tail->next = rl; + else + redo_list_head = rl; + redo_list_tail = rl; +} + static void check_timeout(void) { - extern int am_server, am_daemon; time_t t; - err_list_push(); - - if (!io_timeout) return; + if (!io_timeout) + return; if (!last_io) { last_io = time(NULL); @@ -104,43 +144,180 @@ static void check_timeout(void) } } -/** Setup the fd used to propogate errors */ -void io_set_error_fd(int fd) +/** Setup the fd used to receive MSG_* messages. Only needed when + * we're the generator because the sender and receiver both use the + * multiplexed IO setup. */ +void set_msg_fd_in(int fd) { - io_error_fd = fd; + msg_fd_in = fd; } -/** Read some data from the error fd and write it to the write log code */ -static void read_error_fd(void) +/** Setup the fd used to send our MSG_* messages. Only needed when + * we're the receiver because the generator and the sender both use + * the multiplexed IO setup. */ +void set_msg_fd_out(int fd) +{ + msg_fd_out = fd; + set_nonblocking(msg_fd_out); +} + +/* Add a message to the pending MSG_* list. */ +static void msg_list_add(int code, char *buf, int len) +{ + struct msg_list *ml; + + if (!(ml = new(struct msg_list))) + exit_cleanup(RERR_MALLOC); + ml->next = NULL; + if (!(ml->buf = new_array(char, len+4))) + exit_cleanup(RERR_MALLOC); + SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len); + memcpy(ml->buf+4, buf, len); + ml->len = len+4; + if (msg_list_tail) + msg_list_tail->next = ml; + else + msg_list_head = ml; + msg_list_tail = ml; +} + +void send_msg(enum msgcode code, char *buf, int len) +{ + msg_list_add(code, buf, len); + msg_list_push(NORMAL_FLUSH); +} + +/** Read a message from the MSG_* fd and dispatch it. This is only + * called by the generator. */ +static void read_msg_fd(void) { char buf[200]; size_t n; - int fd = io_error_fd; + int fd = msg_fd_in; int tag, len; - /* io_error_fd is temporarily disabled -- is this meant to - * prevent indefinite recursion? */ - io_error_fd = -1; + /* Temporarily disable msg_fd_in. This is needed because we + * may call a write routine that could try to call us back. */ + msg_fd_in = -1; read_loop(fd, buf, 4); tag = IVAL(buf, 0); len = tag & 0xFFFFFF; - tag = tag >> 24; - tag -= MPLEX_BASE; + tag = (tag >> 24) - MPLEX_BASE; - while (len) { - n = len; - if (n > (sizeof(buf)-1)) - n = sizeof(buf)-1; - read_loop(fd, buf, n); - rwrite((enum logcode)tag, buf, n); - len -= n; + switch (tag) { + case MSG_DONE: + if (len != 0) { + rprintf(FERROR, "invalid message %d:%d\n", tag, len); + exit_cleanup(RERR_STREAMIO); + } + redo_list_add(-1); + break; + case MSG_REDO: + if (len != 4) { + rprintf(FERROR, "invalid message %d:%d\n", tag, len); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, buf, 4); + redo_list_add(IVAL(buf,0)); + break; + case MSG_INFO: + case MSG_ERROR: + case MSG_LOG: + while (len) { + n = len; + if (n >= sizeof buf) + n = sizeof buf - 1; + read_loop(fd, buf, n); + rwrite((enum logcode)tag, buf, n); + len -= n; + } + break; + default: + rprintf(FERROR, "unknown message %d:%d\n", tag, len); + exit_cleanup(RERR_STREAMIO); + } + + msg_fd_in = fd; +} + +/* Try to push messages off the list onto the wire. If we leave with more + * to do, return 0. On error, return -1. If everything flushed, return 1. + * This is only called by the receiver. */ +int msg_list_push(int flush_it_all) +{ + static int written = 0; + struct timeval tv; + fd_set fds; + + if (msg_fd_out < 0) + return -1; + + while (msg_list_head) { + struct msg_list *ml = msg_list_head; + int n = write(msg_fd_out, ml->buf + written, ml->len - written); + if (n < 0) { + if (errno == EINTR) + continue; + if (errno != EWOULDBLOCK && errno != EAGAIN) + return -1; + if (!flush_it_all) + return 0; + FD_ZERO(&fds); + FD_SET(msg_fd_out, &fds); + tv.tv_sec = io_timeout ? io_timeout : SELECT_TIMEOUT; + tv.tv_usec = 0; + if (!select(msg_fd_out+1, NULL, &fds, NULL, &tv)) + check_timeout(); + } else if ((written += n) == ml->len) { + free(ml->buf); + msg_list_head = ml->next; + if (!msg_list_head) + msg_list_tail = NULL; + free(ml); + written = 0; + } } + return 1; +} + +int get_redo_num(void) +{ + struct redo_list *next; + int num; - io_error_fd = fd; + while (!redo_list_head) + read_msg_fd(); + + num = redo_list_head->num; + next = redo_list_head->next; + free(redo_list_head); + redo_list_head = next; + if (!next) + redo_list_tail = NULL; + + return num; } +/** + * When we're the receiver and we have a local --files-from list of names + * that needs to be sent over the socket to the sender, we have to do two + * things at the same time: send the sender a list of what files we're + * processing and read the incoming file+info list from the sender. We do + * this by augmenting the read_timeout() function to copy this data. It + * uses the io_filesfrom_buf to read a block of data from f_in (when it is + * ready, since it might be a pipe) and then blast it out f_out (when it + * is ready to receive more data). + */ +void io_set_filesfrom_fds(int f_in, int f_out) +{ + io_filesfrom_f_in = f_in; + io_filesfrom_f_out = f_out; + io_filesfrom_bp = io_filesfrom_buf; + io_filesfrom_lastchar = '\0'; + io_filesfrom_buflen = 0; +} /** * It's almost always an error to get an EOF when we're trying to read @@ -152,28 +329,28 @@ static void read_error_fd(void) * program where that is a problem (start_socket_client), * kludge_around_eof is True and we just exit. */ -static void whine_about_eof (void) +static void whine_about_eof(void) { if (kludge_around_eof) - exit_cleanup (0); + exit_cleanup(0); else { - rprintf (FERROR, - "%s: connection unexpectedly closed " - "(%.0f bytes read so far)\n", - RSYNC_NAME, (double)stats.total_read); - - exit_cleanup (RERR_STREAMIO); + rprintf(FERROR, + "%s: connection unexpectedly closed " + "(%.0f bytes read so far)\n", + RSYNC_NAME, (double)stats.total_read); + + exit_cleanup(RERR_STREAMIO); } } -static void die_from_readerr (int err) +static void die_from_readerr(int err) { /* this prevents us trying to write errors on a dead socket */ io_multiplexing_close(); - + rprintf(FERROR, "%s: read error: %s\n", - RSYNC_NAME, strerror (err)); + RSYNC_NAME, strerror(err)); exit_cleanup(RERR_STREAMIO); } @@ -189,24 +366,43 @@ static void die_from_readerr (int err) * give a better explanation. We can tell whether the connection has * started by looking e.g. at whether the remote version is known yet. */ -static int read_timeout (int fd, char *buf, size_t len) +static int read_timeout(int fd, char *buf, size_t len) { int n, ret=0; - io_flush(); + io_flush(NORMAL_FLUSH); while (ret == 0) { /* until we manage to read *something* */ - fd_set fds; + fd_set r_fds, w_fds; struct timeval tv; int fd_count = fd+1; int count; - FD_ZERO(&fds); - FD_SET(fd, &fds); - if (io_error_fd != -1) { - FD_SET(io_error_fd, &fds); - if (io_error_fd > fd) fd_count = io_error_fd+1; + FD_ZERO(&r_fds); + FD_SET(fd, &r_fds); + if (msg_fd_in >= 0) { + FD_SET(msg_fd_in, &r_fds); + if (msg_fd_in >= fd_count) + fd_count = msg_fd_in+1; + } + if (io_filesfrom_f_out >= 0) { + int new_fd; + if (io_filesfrom_buflen == 0) { + if (io_filesfrom_f_in >= 0) { + FD_SET(io_filesfrom_f_in, &r_fds); + new_fd = io_filesfrom_f_in; + } else { + io_filesfrom_f_out = -1; + new_fd = -1; + } + } else { + FD_ZERO(&w_fds); + FD_SET(io_filesfrom_f_out, &w_fds); + new_fd = io_filesfrom_f_out; + } + if (new_fd >= fd_count) + fd_count = new_fd+1; } tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT; @@ -214,9 +410,12 @@ static int read_timeout (int fd, char *buf, size_t len) errno = 0; - count = select(fd_count, &fds, NULL, NULL, &tv); + count = select(fd_count, &r_fds, + io_filesfrom_buflen? &w_fds : NULL, + NULL, &tv); if (count == 0) { + msg_list_push(NORMAL_FLUSH); check_timeout(); } @@ -227,11 +426,74 @@ static int read_timeout (int fd, char *buf, size_t len) continue; } - if (io_error_fd != -1 && FD_ISSET(io_error_fd, &fds)) { - read_error_fd(); + if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds)) + read_msg_fd(); + + if (io_filesfrom_f_out >= 0) { + if (io_filesfrom_buflen) { + if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { + int l = write(io_filesfrom_f_out, + io_filesfrom_bp, + io_filesfrom_buflen); + if (l > 0) { + if (!(io_filesfrom_buflen -= l)) + io_filesfrom_bp = io_filesfrom_buf; + else + io_filesfrom_bp += l; + } else { + /* XXX should we complain? */ + io_filesfrom_f_out = -1; + } + } + } else if (io_filesfrom_f_in >= 0) { + if (FD_ISSET(io_filesfrom_f_in, &r_fds)) { + int l = read(io_filesfrom_f_in, + io_filesfrom_buf, + sizeof io_filesfrom_buf); + if (l <= 0) { + /* Send end-of-file marker */ + io_filesfrom_buf[0] = '\0'; + io_filesfrom_buf[1] = '\0'; + io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1; + io_filesfrom_f_in = -1; + } else { + extern int eol_nulls; + if (!eol_nulls) { + char *s = io_filesfrom_buf + l; + /* Transform CR and/or LF into '\0' */ + while (s-- > io_filesfrom_buf) { + if (*s == '\n' || *s == '\r') + *s = '\0'; + } + } + if (!io_filesfrom_lastchar) { + /* Last buf ended with a '\0', so don't + * let this buf start with one. */ + while (l && !*io_filesfrom_bp) + io_filesfrom_bp++, l--; + } + if (!l) + io_filesfrom_bp = io_filesfrom_buf; + else { + char *f = io_filesfrom_bp; + char *t = f; + char *eob = f + l; + /* Eliminate any multi-'\0' runs. */ + while (f != eob) { + if (!(*t++ = *f++)) { + while (f != eob && !*f) + f++, l--; + } + } + io_filesfrom_lastchar = f[-1]; + } + io_filesfrom_buflen = l; + } + } + } } - if (!FD_ISSET(fd, &fds)) continue; + if (!FD_ISSET(fd, &r_fds)) continue; n = read(fd, buf, len); @@ -243,28 +505,75 @@ static int read_timeout (int fd, char *buf, size_t len) last_io = time(NULL); continue; } else if (n == 0) { - whine_about_eof (); + whine_about_eof(); return -1; /* doesn't return */ - } else if (n == -1) { + } else if (n < 0) { if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) continue; - else - die_from_readerr (errno); + die_from_readerr(errno); } } return ret; } +/** + * Read a line into the "fname" buffer (which must be at least MAXPATHLEN + * characters long). + */ +int read_filesfrom_line(int fd, char *fname) +{ + char ch, *s, *eob = fname + MAXPATHLEN - 1; + int cnt; + extern int io_timeout; + extern int eol_nulls; + extern char *remote_filesfrom_file; + int reading_remotely = remote_filesfrom_file != NULL; + int nulls = eol_nulls || reading_remotely; + + start: + s = fname; + while (1) { + cnt = read(fd, &ch, 1); + if (cnt < 0 && (errno == EWOULDBLOCK + || errno == EINTR || errno == EAGAIN)) { + struct timeval tv; + fd_set fds; + FD_ZERO(&fds); + FD_SET(fd, &fds); + tv.tv_sec = io_timeout? io_timeout : SELECT_TIMEOUT; + tv.tv_usec = 0; + if (!select(fd+1, &fds, NULL, NULL, &tv)) + check_timeout(); + continue; + } + if (cnt != 1) + break; + if (nulls? !ch : (ch == '\r' || ch == '\n')) { + /* Skip empty lines if reading locally. */ + if (!reading_remotely && s == fname) + continue; + break; + } + if (s < eob) + *s++ = ch; + } + *s = '\0'; + /* Dump comments. */ + if (*fname == '#' || *fname == ';') + goto start; + + return s - fname; +} /** * Continue trying to read len bytes - don't return until len has been * read. **/ -static void read_loop (int fd, char *buf, size_t len) +static void read_loop(int fd, char *buf, size_t len) { while (len) { int n = read_timeout(fd, buf, len); @@ -286,48 +595,69 @@ static int read_unbuffered(int fd, char *buf, size_t len) static size_t remaining; int tag, ret = 0; char line[1024]; + static char *buffer; + static size_t bufferIdx = 0; + static size_t bufferSz; - if (!io_multiplexing_in || fd != multiplex_in_fd) + if (fd != multiplex_in_fd) return read_timeout(fd, buf, len); + if (!io_multiplexing_in && remaining == 0) { + if (!buffer) { + bufferSz = 2 * IO_BUFFER_SIZE; + buffer = new_array(char, bufferSz); + if (!buffer) out_of_memory("read_unbuffered"); + } + remaining = read_timeout(fd, buffer, bufferSz); + bufferIdx = 0; + } + while (ret == 0) { if (remaining) { len = MIN(len, remaining); - read_loop(fd, buf, len); + memcpy(buf, buffer + bufferIdx, len); + bufferIdx += len; remaining -= len; ret = len; - continue; + break; } read_loop(fd, line, 4); tag = IVAL(line, 0); remaining = tag & 0xFFFFFF; - tag = tag >> 24; - - if (tag == MPLEX_BASE) - continue; - - tag -= MPLEX_BASE; - - if (tag != FERROR && tag != FINFO) { + tag = (tag >> 24) - MPLEX_BASE; + + switch (tag) { + case MSG_DATA: + if (!buffer || remaining > bufferSz) { + buffer = realloc_array(buffer, char, remaining); + if (!buffer) out_of_memory("read_unbuffered"); + bufferSz = remaining; + } + read_loop(fd, buffer, remaining); + bufferIdx = 0; + break; + case MSG_INFO: + case MSG_ERROR: + if (remaining >= sizeof line) { + rprintf(FERROR, "multiplexing overflow %d:%ld\n\n", + tag, (long)remaining); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, line, remaining); + rwrite((enum logcode)tag, line, remaining); + remaining = 0; + break; + default: rprintf(FERROR, "unexpected tag %d\n", tag); exit_cleanup(RERR_STREAMIO); } - - if (remaining > sizeof(line) - 1) { - rprintf(FERROR, "multiplexing overflow %d\n\n", - remaining); - exit_cleanup(RERR_STREAMIO); - } - - read_loop(fd, line, remaining); - line[remaining] = 0; - - rprintf((enum logcode) tag, "%s", line); - remaining = 0; } + if (remaining == 0) + io_flush(NORMAL_FLUSH); + return ret; } @@ -338,15 +668,13 @@ static int read_unbuffered(int fd, char *buf, size_t len) * have been read. If all @p n can't be read then exit with an * error. **/ -static void readfd (int fd, char *buffer, size_t N) +static void readfd(int fd, char *buffer, size_t N) { int ret; size_t total=0; - - while (total < N) { - io_flush(); - ret = read_unbuffered (fd, buffer + total, N-total); + while (total < N) { + ret = read_unbuffered(fd, buffer + total, N-total); total += ret; } @@ -367,7 +695,6 @@ int32 read_int(int f) int64 read_longint(int f) { - extern int remote_version; int64 ret; char b[8]; ret = read_int(f); @@ -380,10 +707,8 @@ int64 read_longint(int f) rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n"); exit_cleanup(RERR_UNSUPPORTED); #else - if (remote_version >= 16) { - readfd(f,b,8); - ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32); - } + readfd(f,b,8); + ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32); #endif return ret; @@ -396,14 +721,14 @@ void read_buf(int f,char *buf,size_t len) void read_sbuf(int f,char *buf,size_t len) { - read_buf (f,buf,len); + read_buf(f,buf,len); buf[len] = 0; } unsigned char read_byte(int f) { unsigned char c; - read_buf (f, (char *)&c, 1); + read_buf(f, (char *)&c, 1); return c; } @@ -426,7 +751,7 @@ static void sleep_for_bwlimit(int bytes_written) assert(bytes_written > 0); assert(bwlimit > 0); - + tv.tv_usec = bytes_written * 1000 / bwlimit; tv.tv_sec = tv.tv_usec / 1000000; tv.tv_usec = tv.tv_usec % 1000000; @@ -448,33 +773,31 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) int fd_count, count; struct timeval tv; - err_list_push(); + msg_list_push(NORMAL_FLUSH); no_flush++; while (total < len) { FD_ZERO(&w_fds); - FD_ZERO(&r_fds); FD_SET(fd,&w_fds); fd_count = fd; - if (io_error_fd != -1) { - FD_SET(io_error_fd,&r_fds); - if (io_error_fd > fd_count) - fd_count = io_error_fd; + if (msg_fd_in >= 0) { + FD_ZERO(&r_fds); + FD_SET(msg_fd_in,&r_fds); + if (msg_fd_in > fd_count) + fd_count = msg_fd_in; } tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT; tv.tv_usec = 0; errno = 0; - - count = select(fd_count+1, - io_error_fd != -1?&r_fds:NULL, - &w_fds,NULL, - &tv); + count = select(fd_count+1, msg_fd_in >= 0 ? &r_fds : NULL, + &w_fds, NULL, &tv); if (count == 0) { + msg_list_push(NORMAL_FLUSH); check_timeout(); } @@ -485,23 +808,21 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) continue; } - if (io_error_fd != -1 && FD_ISSET(io_error_fd, &r_fds)) { - read_error_fd(); - } + if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds)) + read_msg_fd(); if (FD_ISSET(fd, &w_fds)) { int ret; size_t n = len-total; ret = write(fd,buf+total,n); - if (ret == -1 && errno == EINTR) { - continue; - } - - if (ret == -1 && - (errno == EWOULDBLOCK || errno == EAGAIN)) { - msleep(1); - continue; + if (ret < 0) { + if (errno == EINTR) + continue; + if (errno == EWOULDBLOCK || errno == EAGAIN) { + msleep(1); + continue; + } } if (ret <= 0) { @@ -531,28 +852,33 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) static char *io_buffer; static int io_buffer_count; -void io_start_buffering(int fd) +void io_start_buffering_out(int fd) { if (io_buffer) return; multiplex_out_fd = fd; - io_buffer = (char *)malloc(IO_BUFFER_SIZE); + io_buffer = new_array(char, IO_BUFFER_SIZE); if (!io_buffer) out_of_memory("writefd"); io_buffer_count = 0; } +void io_start_buffering_in(int fd) +{ + multiplex_in_fd = fd; +} + /** * Write an message to a multiplexed stream. If this fails then rsync * exits. **/ -static void mplex_write(int fd, enum logcode code, char *buf, size_t len) +static void mplex_write(int fd, enum msgcode code, char *buf, size_t len) { char buffer[4096]; size_t n = len; SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - if (n > (sizeof(buffer)-4)) { - n = sizeof(buffer)-4; + if (n > (sizeof buffer - 4)) { + n = sizeof buffer - 4; } memcpy(&buffer[4], buf, n); @@ -567,26 +893,26 @@ static void mplex_write(int fd, enum logcode code, char *buf, size_t len) } -void io_flush(void) +void io_flush(int flush_it_all) { int fd = multiplex_out_fd; + + msg_list_push(flush_it_all); - err_list_push(); - - if (!io_buffer_count || no_flush) return; + if (!io_buffer_count || no_flush) + return; - if (io_multiplexing_out) { - mplex_write(fd, FNONE, io_buffer, io_buffer_count); - } else { + if (io_multiplexing_out) + mplex_write(fd, MSG_DATA, io_buffer, io_buffer_count); + else writefd_unbuffered(fd, io_buffer, io_buffer_count); - } io_buffer_count = 0; } void io_end_buffering(void) { - io_flush(); + io_flush(NORMAL_FLUSH); if (!io_multiplexing_out) { free(io_buffer); io_buffer = NULL; @@ -597,7 +923,7 @@ static void writefd(int fd,char *buf,size_t len) { stats.total_written += len; - err_list_push(); + msg_list_push(NORMAL_FLUSH); if (!io_buffer || fd != multiplex_out_fd) { writefd_unbuffered(fd, buf, len); @@ -612,8 +938,9 @@ static void writefd(int fd,char *buf,size_t len) len -= n; io_buffer_count += n; } - - if (io_buffer_count == IO_BUFFER_SIZE) io_flush(); + + if (io_buffer_count == IO_BUFFER_SIZE) + io_flush(NORMAL_FLUSH); } } @@ -640,19 +967,23 @@ void write_int_named(int f, int32 x, const char *phase) */ void write_longint(int f, int64 x) { - extern int remote_version; char b[8]; - if (remote_version < 16 || x <= 0x7FFFFFFF) { + if (x <= 0x7FFFFFFF) { write_int(f, (int)x); return; } +#ifdef NO_INT64 + rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else write_int(f, (int32)0xFFFFFFFF); SIVAL(b,0,(x&0xFFFFFFFF)); SIVAL(b,4,((x>>32)&0xFFFFFFFF)); writefd(f,b,8); +#endif } void write_buf(int f,char *buf,size_t len) @@ -710,9 +1041,9 @@ void io_printf(int fd, const char *format, ...) va_list ap; char buf[1024]; int len; - + va_start(ap, format); - len = vsnprintf(buf, sizeof(buf), format, ap); + len = vsnprintf(buf, sizeof buf, format, ap); va_end(ap); if (len < 0) exit_cleanup(RERR_STREAMIO); @@ -721,35 +1052,35 @@ void io_printf(int fd, const char *format, ...) } -/** Setup for multiplexing an error stream with the data stream */ +/** Setup for multiplexing a MSG_* stream with the data stream. */ void io_start_multiplex_out(int fd) { multiplex_out_fd = fd; - io_flush(); - io_start_buffering(fd); + io_flush(NORMAL_FLUSH); + io_start_buffering_out(fd); io_multiplexing_out = 1; } -/** Setup for multiplexing an error stream with the data stream */ +/** Setup for multiplexing a MSG_* stream with the data stream. */ void io_start_multiplex_in(int fd) { multiplex_in_fd = fd; - io_flush(); + io_flush(NORMAL_FLUSH); io_multiplexing_in = 1; } -/** Write an message to the multiplexed error stream */ -int io_multiplex_write(enum logcode code, char *buf, size_t len) +/** Write an message to the multiplexed data stream. */ +int io_multiplex_write(enum msgcode code, char *buf, size_t len) { if (!io_multiplexing_out) return 0; - io_flush(); + io_flush(NORMAL_FLUSH); stats.total_written += (len+4); mplex_write(multiplex_out_fd, code, buf, len); return 1; } -/** Stop output multiplexing */ +/** Stop output multiplexing. */ void io_multiplexing_close(void) { io_multiplexing_out = 0;