X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/29349024c409421a3720bcbd811089177c3bb6b9..6d56efa6ea66afa2e6f4eb79d9dd5f3b54b723c3:/io.c diff --git a/io.c b/io.c index d6c1462a..6e5c2329 100644 --- a/io.c +++ b/io.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ * io_start_multiplex_out() and io_start_multiplex_in(). */ #include "rsync.h" +#include "ifuncs.h" /** If no timeout is specified then use a 60 second select timeout */ #define SELECT_TIMEOUT 60 @@ -44,16 +45,18 @@ extern int inc_recurse; extern int io_error; extern int eol_nulls; extern int flist_eof; +extern int list_only; extern int read_batch; extern int csum_length; +extern int protect_args; extern int checksum_seed; extern int protocol_version; extern int remove_source_files; extern int preserve_hard_links; -extern char *filesfrom_host; extern struct stats stats; -extern struct file_list *cur_flist, *first_flist; +extern struct file_list *cur_flist; #ifdef ICONV_OPTION +extern int filesfrom_convert; extern iconv_t ic_send, ic_recv; #endif @@ -93,17 +96,16 @@ static int write_batch_monitor_out = -1; static int io_filesfrom_f_in = -1; static int io_filesfrom_f_out = -1; -static char io_filesfrom_buf[2048]; +static xbuf ff_buf = EMPTY_XBUF; +static char ff_lastchar; #ifdef ICONV_OPTION -static char iconv_buf[sizeof io_filesfrom_buf / 2]; +static xbuf iconv_buf = EMPTY_XBUF; #endif -static char *io_filesfrom_bp; -static char io_filesfrom_lastchar; -static int io_filesfrom_buflen; -static int defer_forwarding_messages = 0; +static int defer_forwarding_messages = 0, defer_forwarding_keep = 0; static int select_timeout = SELECT_TIMEOUT; static int active_filecnt = 0; static OFF_T active_bytecnt = 0; +static int first_message = 1; static char int_byte_extra[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (00 - 3F)/4 */ @@ -112,6 +114,9 @@ static char int_byte_extra[64] = { 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */ }; +#define REMOTE_OPTION_ERROR "rsync: on remote machine: -" +#define REMOTE_OPTION_ERROR2 ": unknown option" + enum festatus { FES_SUCCESS, FES_REDO, FES_NO_SEND }; static void readfd(int fd, char *buffer, size_t N); @@ -181,7 +186,6 @@ static void got_flist_entry_status(enum festatus status, const char *buf) struct file_list *flist = flist_for_ndx(ndx); assert(flist != NULL); - assert(ndx >= flist->ndx_start); if (remove_source_files) { active_filecnt--; @@ -197,8 +201,10 @@ static void got_flist_entry_status(enum festatus status, const char *buf) send_msg(MSG_SUCCESS, buf, 4, 0); if (preserve_hard_links) { struct file_struct *file = flist->files[ndx - flist->ndx_start]; - if (F_IS_HLINKED(file)) + if (F_IS_HLINKED(file)) { flist_ndx_push(&hlink_list, ndx); + flist->in_progress++; + } } break; case FES_REDO: @@ -320,6 +326,36 @@ static void msg_flush(void) } } +static void check_for_d_option_error(const char *msg) +{ + static char rsync263_opts[] = "BCDHIKLPRSTWabceghlnopqrtuvxz"; + char *colon; + int saw_d = 0; + + if (*msg != 'r' + || strncmp(msg, REMOTE_OPTION_ERROR, sizeof REMOTE_OPTION_ERROR - 1) != 0) + return; + + msg += sizeof REMOTE_OPTION_ERROR - 1; + if (*msg == '-' || (colon = strchr(msg, ':')) == NULL + || strncmp(colon, REMOTE_OPTION_ERROR2, sizeof REMOTE_OPTION_ERROR2 - 1) != 0) + return; + + for ( ; *msg != ':'; msg++) { + if (*msg == 'd') + saw_d = 1; + else if (*msg == 'e') + break; + else if (strchr(rsync263_opts, *msg) == NULL) + return; + } + + if (saw_d) { + rprintf(FWARNING, + "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n"); + } +} + /* Read a message from the MSG_* fd and handle it. This is called either * during the early stages of being a local sender (up through the sending * of the file list) or when we're the generator (to fetch the messages @@ -372,18 +408,28 @@ static void read_msg_fd(void) /* Read extra file list from receiver. */ assert(iobuf_in != NULL); assert(iobuf_f_in == fd); - if (verbose > 3) { + if (DEBUG_GTE(FLIST, 2)) { rprintf(FINFO, "[%s] receiving flist for dir %d\n", who_am_i(), IVAL(buf,0)); } flist = recv_file_list(fd); flist->parent_ndx = IVAL(buf,0); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links) + match_hard_links(flist); +#endif break; case MSG_FLIST_EOF: if (len != 0 || !am_generator || !inc_recurse) goto invalid_msg; flist_eof = 1; break; + case MSG_IO_ERROR: + if (len != 4) + goto invalid_msg; + readfd(fd, buf, len); + io_error |= IVAL(buf, 0); + break; case MSG_DELETED: if (len >= (int)sizeof buf || !am_generator) goto invalid_msg; @@ -402,15 +448,17 @@ static void read_msg_fd(void) readfd(fd, buf, 4); got_flist_entry_status(FES_NO_SEND, buf); break; - case MSG_SOCKERR: + case MSG_ERROR_SOCKET: case MSG_CLIENT: if (!am_generator) goto invalid_msg; - if (tag == MSG_SOCKERR) + if (tag == MSG_ERROR_SOCKET) io_end_multiplex_out(); /* FALL THROUGH */ case MSG_INFO: case MSG_ERROR: + case MSG_ERROR_XFER: + case MSG_WARNING: case MSG_LOG: while (len) { n = len; @@ -429,7 +477,7 @@ static void read_msg_fd(void) no_flush--; msg_fd_in = fd; - if (!--defer_forwarding_messages) + if (!--defer_forwarding_messages && !no_flush) msg_flush(); } @@ -457,51 +505,41 @@ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ size_t n = len; - SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - #ifdef ICONV_OPTION - if (convert && ic_send == (iconv_t)-1) -#endif - convert = 0; + /* We need to convert buf before doing anything else so that we + * can include the (converted) byte length in the message header. */ + if (convert && ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; + + INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4); + INIT_XBUF(inbuf, (char*)buf, len, -1); + + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + if (inbuf.len > 0) { + rprintf(FERROR, "overflowed conversion buffer in mplex_write"); + exit_cleanup(RERR_UNSUPPORTED); + } - if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ - n = 0; + n = len = outbuf.len; + } else +#endif + if (n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ + n = 0; /* We'd rather do 2 writes than too much memcpy(). */ else memcpy(buffer + 4, buf, n); + SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); + + defer_forwarding_keep = 1; /* defer_forwarding_messages++ on return */ writefd_unbuffered(fd, buffer, n+4); + defer_forwarding_keep = 0; - len -= n; - buf += n; + if (len > n) + writefd_unbuffered(fd, buf+n, len-n); -#ifdef ICONV_OPTION - if (convert) { - iconv(ic_send, NULL, 0, NULL, 0); - defer_forwarding_messages++; - while (len) { - ICONV_CONST char *ibuf = (ICONV_CONST char *)buf; - char *obuf = buffer; - size_t ocnt = sizeof buffer; - while (len && iconv(ic_send, &ibuf,&len, - &obuf,&ocnt) == (size_t)-1) { - if (errno == E2BIG || !ocnt) - break; - *obuf++ = *ibuf++; - ocnt--, len--; - } - n = obuf - buffer; - writefd_unbuffered(fd, buffer, n); - } - if (!--defer_forwarding_messages) - msg_flush(); - } else -#endif - if (len) { - defer_forwarding_messages++; - writefd_unbuffered(fd, buf, len); - if (!--defer_forwarding_messages) - msg_flush(); - } + if (!--defer_forwarding_messages && !no_flush) + msg_flush(); } int send_msg(enum msgcode code, const char *buf, int len, int convert) @@ -552,17 +590,19 @@ int get_hlink_num(void) * 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). + * uses ff_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; + alloc_xbuf(&ff_buf, 2048); +#ifdef ICONV_OPTION + if (protect_args) + alloc_xbuf(&iconv_buf, 1024); +#endif } /* It's almost always an error to get an EOF when we're trying to read from the @@ -589,8 +629,8 @@ static void whine_about_eof(int fd) } rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed " - "(%.0f bytes received so far) [%s]\n", - (double)stats.total_read, who_am_i()); + "(%s bytes received so far) [%s]\n", + big_num(stats.total_read, 0), who_am_i()); exit_cleanup(RERR_STREAMIO); } @@ -624,7 +664,7 @@ static int read_timeout(int fd, char *buf, size_t len) FD_SET(fd, &r_fds); if (io_filesfrom_f_out >= 0) { int new_fd; - if (io_filesfrom_buflen == 0) { + if (ff_buf.len == 0) { if (io_filesfrom_f_in >= 0) { FD_SET(io_filesfrom_f_in, &r_fds); new_fd = io_filesfrom_f_in; @@ -657,16 +697,16 @@ static int read_timeout(int fd, char *buf, size_t len) } if (io_filesfrom_f_out >= 0) { - if (io_filesfrom_buflen) { + if (ff_buf.len) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { int l = write(io_filesfrom_f_out, - io_filesfrom_bp, - io_filesfrom_buflen); + ff_buf.buf + ff_buf.pos, + ff_buf.len); if (l > 0) { - if (!(io_filesfrom_buflen -= l)) - io_filesfrom_bp = io_filesfrom_buf; + if (!(ff_buf.len -= l)) + ff_buf.pos = 0; else - io_filesfrom_bp += l; + ff_buf.pos += l; } else if (errno != EINTR) { /* XXX should we complain? */ io_filesfrom_f_out = -1; @@ -674,36 +714,48 @@ static int read_timeout(int fd, char *buf, size_t len) } } 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); +#ifdef ICONV_OPTION + xbuf *ibuf = filesfrom_convert ? &iconv_buf : &ff_buf; +#else + xbuf *ibuf = &ff_buf; +#endif + int l = read(io_filesfrom_f_in, ibuf->buf, ibuf->size); if (l <= 0) { if (l == 0 || errno != EINTR) { /* Send end-of-file marker */ - io_filesfrom_buf[0] = '\0'; - io_filesfrom_buf[1] = '\0'; - io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1; + memcpy(ff_buf.buf, "\0\0", 2); + ff_buf.len = ff_lastchar? 2 : 1; + ff_buf.pos = 0; io_filesfrom_f_in = -1; } } else { +#ifdef ICONV_OPTION + if (filesfrom_convert) { + iconv_buf.pos = 0; + iconv_buf.len = l; + iconvbufs(ic_send, &iconv_buf, &ff_buf, + ICB_EXPAND_OUT|ICB_INCLUDE_BAD|ICB_INCLUDE_INCOMPLETE); + l = ff_buf.len; + } +#endif if (!eol_nulls) { - char *s = io_filesfrom_buf + l; + char *s = ff_buf.buf + l; /* Transform CR and/or LF into '\0' */ - while (s-- > io_filesfrom_buf) { + while (s-- > ff_buf.buf) { if (*s == '\n' || *s == '\r') *s = '\0'; } } - if (!io_filesfrom_lastchar) { + if (!ff_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--; + while (l && ff_buf.buf[ff_buf.pos] == '\0') + ff_buf.pos++, l--; } if (!l) - io_filesfrom_bp = io_filesfrom_buf; + ff_buf.pos = 0; else { - char *f = io_filesfrom_bp; + char *f = ff_buf.buf + ff_buf.pos; char *t = f; char *eob = f + l; /* Eliminate any multi-'\0' runs. */ @@ -713,9 +765,9 @@ static int read_timeout(int fd, char *buf, size_t len) f++, l--; } } - io_filesfrom_lastchar = f[-1]; + ff_lastchar = f[-1]; } - io_filesfrom_buflen = l; + ff_buf.len = l; } } } @@ -736,7 +788,7 @@ static int read_timeout(int fd, char *buf, size_t len) /* Don't write errors on a dead socket. */ if (fd == sock_f_in) { io_end_multiplex_out(); - rsyserr(FSOCKERR, errno, "read error"); + rsyserr(FERROR_SOCKET, errno, "read error"); } else rsyserr(FERROR, errno, "read error"); exit_cleanup(RERR_STREAMIO); @@ -753,17 +805,24 @@ static int read_timeout(int fd, char *buf, size_t len) return cnt; } -/* Read a line into the "fname" buffer (which must be at least MAXPATHLEN - * characters long). */ -int read_filesfrom_line(int fd, char *fname) +/* Read a line into the "buf" buffer. */ +int read_line(int fd, char *buf, size_t bufsiz, int flags) { - char ch, *s, *eob = fname + MAXPATHLEN - 1; + char ch, *s, *eob; int cnt; - int reading_remotely = filesfrom_host != NULL; - int nulls = eol_nulls || reading_remotely; + +#ifdef ICONV_OPTION + if (flags & RL_CONVERT && iconv_buf.size < bufsiz) + realloc_xbuf(&iconv_buf, bufsiz + 1024); +#endif start: - s = fname; +#ifdef ICONV_OPTION + s = flags & RL_CONVERT ? iconv_buf.buf : buf; +#else + s = buf; +#endif + eob = s + bufsiz - 1; while (1) { cnt = read(fd, &ch, 1); if (cnt < 0 && (errno == EWOULDBLOCK @@ -778,17 +837,15 @@ int read_filesfrom_line(int fd, char *fname) tv.tv_usec = 0; if (!select(fd+1, &r_fds, NULL, &e_fds, &tv)) check_timeout(); - if (FD_ISSET(fd, &e_fds)) { - rsyserr(FINFO, errno, - "select exception on fd %d", fd); - } + /*if (FD_ISSET(fd, &e_fds)) + rprintf(FINFO, "select exception on fd %d\n", fd); */ continue; } if (cnt != 1) break; - if (nulls? !ch : (ch == '\r' || ch == '\n')) { - /* Skip empty lines if reading locally. */ - if (!reading_remotely && s == fname) + if (flags & RL_EOL_NULLS ? ch == '\0' : (ch == '\r' || ch == '\n')) { + /* Skip empty lines if dumping comments. */ + if (flags & RL_DUMP_COMMENTS && s == buf) continue; break; } @@ -797,11 +854,76 @@ int read_filesfrom_line(int fd, char *fname) } *s = '\0'; - /* Dump comments. */ - if (*fname == '#' || *fname == ';') + if (flags & RL_DUMP_COMMENTS && (*buf == '#' || *buf == ';')) goto start; - return s - fname; +#ifdef ICONV_OPTION + if (flags & RL_CONVERT) { + xbuf outbuf; + INIT_XBUF(outbuf, buf, 0, bufsiz); + iconv_buf.pos = 0; + iconv_buf.len = s - iconv_buf.buf; + iconvbufs(ic_recv, &iconv_buf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + outbuf.buf[outbuf.len] = '\0'; + return outbuf.len; + } +#endif + + return s - buf; +} + +void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls, + char ***argv_p, int *argc_p, char **request_p) +{ + int maxargs = MAX_ARGS; + int dot_pos = 0; + int argc = 0; + char **argv, *p; + int rl_flags = (rl_nulls ? RL_EOL_NULLS : 0); + +#ifdef ICONV_OPTION + rl_flags |= (protect_args && ic_recv != (iconv_t)-1 ? RL_CONVERT : 0); +#endif + + if (!(argv = new_array(char *, maxargs))) + out_of_memory("read_args"); + if (mod_name && !protect_args) + argv[argc++] = "rsyncd"; + + while (1) { + if (read_line(f_in, buf, bufsiz, rl_flags) == 0) + break; + + if (argc == maxargs-1) { + maxargs += MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("read_args"); + } + + if (dot_pos) { + if (request_p) { + *request_p = strdup(buf); + request_p = NULL; + } + if (mod_name) + glob_expand_module(mod_name, buf, &argv, &argc, &maxargs); + else + glob_expand(buf, &argv, &argc, &maxargs); + } else { + if (!(p = strdup(buf))) + out_of_memory("read_args"); + argv[argc++] = p; + if (*p == '.' && p[1] == '\0') + dot_pos = argc; + } + } + argv[argc] = NULL; + + glob_expand(NULL, NULL, NULL, NULL); + + *argc_p = argc; + *argv_p = argv; } int io_start_buffering_out(int f_out) @@ -959,6 +1081,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) if (msg_bytes != 4) goto invalid_msg; read_loop(fd, line, msg_bytes); + send_msg_int(MSG_IO_ERROR, IVAL(line, 0)); io_error |= IVAL(line, 0); break; case MSG_DELETED: @@ -966,25 +1089,32 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) goto overflow; #ifdef ICONV_OPTION if (ic_recv != (iconv_t)-1) { - ICONV_CONST char *ibuf; - char *obuf = line; - size_t icnt, ocnt = sizeof line - 1; + xbuf outbuf, inbuf; + char ibuf[512]; int add_null = 0; - iconv(ic_send, NULL, 0, NULL, 0); + int pos = 0; + + INIT_CONST_XBUF(outbuf, line); + INIT_XBUF(inbuf, ibuf, 0, -1); + while (msg_bytes) { - icnt = msg_bytes > sizeof iconv_buf - ? sizeof iconv_buf : msg_bytes; - read_loop(fd, iconv_buf, icnt); - if (!(msg_bytes -= icnt) && !iconv_buf[icnt-1]) - icnt--, add_null = 1; - ibuf = (ICONV_CONST char *)iconv_buf; - if (iconv(ic_send, &ibuf,&icnt, - &obuf,&ocnt) == (size_t)-1) - goto overflow; // XXX + inbuf.len = msg_bytes > sizeof ibuf + ? sizeof ibuf : msg_bytes; + read_loop(fd, inbuf.buf, inbuf.len); + if (!(msg_bytes -= inbuf.len) + && !ibuf[inbuf.len-1]) + inbuf.len--, add_null = 1; + if (iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE) < 0) + goto overflow; + pos = -1; } - if (add_null) - *obuf++ = '\0'; - msg_bytes = obuf - line; + if (add_null) { + if (outbuf.len == outbuf.size) + goto overflow; + outbuf.buf[outbuf.len++] = '\0'; + } + msg_bytes = outbuf.len; } else #endif read_loop(fd, line, msg_bytes); @@ -1014,6 +1144,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) break; case MSG_INFO: case MSG_ERROR: + case MSG_ERROR_XFER: + case MSG_WARNING: if (msg_bytes >= sizeof line) { overflow: rprintf(FERROR, @@ -1023,6 +1155,13 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) } read_loop(fd, line, msg_bytes); rwrite((enum logcode)tag, line, msg_bytes, 1); + if (first_message) { + if (list_only && !am_sender && tag == 1) { + line[msg_bytes] = '\0'; + check_for_d_option_error(line); + } + first_message = 0; + } break; default: rprintf(FERROR, "unexpected tag %d [%s]\n", @@ -1215,6 +1354,7 @@ int read_vstring(int f, char *buf, int bufsize) * called by both the sender and the receiver. */ void read_sum_head(int f, struct sum_struct *sum) { + int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE; sum->count = read_int(f); if (sum->count < 0) { rprintf(FERROR, "Invalid checksum count %ld [%s]\n", @@ -1222,7 +1362,7 @@ void read_sum_head(int f, struct sum_struct *sum) exit_cleanup(RERR_PROTOCOL); } sum->blength = read_int(f); - if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) { + if (sum->blength < 0 || sum->blength > max_blength) { rprintf(FERROR, "Invalid block length %ld [%s]\n", (long)sum->blength, who_am_i()); exit_cleanup(RERR_PROTOCOL); @@ -1360,10 +1500,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) continue; } - if (FD_ISSET(fd, &e_fds)) { - rsyserr(FINFO, errno, - "select exception on fd %d", fd); - } + /*if (FD_ISSET(fd, &e_fds)) + rprintf(FINFO, "select exception on fd %d\n", fd); */ if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds)) read_msg_fd(); @@ -1397,11 +1535,11 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) (long)len, who_am_i()); /* If the other side is sending us error messages, try * to grab any messages they sent before they died. */ - while (fd == sock_f_out && io_multiplexing_in) { + while (!am_server && fd == sock_f_out && io_multiplexing_in) { + char buf[1024]; set_io_timeout(30); ignore_timeout = 0; - readfd_unbuffered(sock_f_in, io_filesfrom_buf, - sizeof io_filesfrom_buf); + readfd_unbuffered(sock_f_in, buf, sizeof buf); } exit_cleanup(RERR_STREAMIO); } @@ -1417,7 +1555,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } no_flush--; - if (!(defer_forwarding_messages -= defer_inc)) + defer_inc -= defer_forwarding_keep; + if (!(defer_forwarding_messages -= defer_inc) && !no_flush) msg_flush(); } @@ -1676,16 +1815,13 @@ int32 read_ndx(int f) return num; } -/** - * Read a line of up to @p maxlen characters into @p buf (not counting - * the trailing null). Strips the (required) trailing newline and all - * carriage returns. - * - * @return 1 for success; 0 for I/O error or truncation. - **/ -int read_line(int f, char *buf, size_t maxlen) +/* Read a line of up to bufsiz-1 characters into buf. Strips + * the (required) trailing newline and all carriage returns. + * Returns 1 for success; 0 for I/O error or truncation. */ +int read_line_old(int f, char *buf, size_t bufsiz) { - while (maxlen) { + bufsiz--; /* leave room for the null */ + while (bufsiz > 0) { buf[0] = 0; read_buf(f, buf, 1); if (buf[0] == 0) @@ -1694,11 +1830,11 @@ int read_line(int f, char *buf, size_t maxlen) break; if (buf[0] != '\r') { buf++; - maxlen--; + bufsiz--; } } *buf = '\0'; - return maxlen > 0; + return bufsiz > 0; } void io_printf(int fd, const char *format, ...) @@ -1770,6 +1906,8 @@ void start_write_batch(int fd) * actual communication so far depends on whether a daemon * is involved. */ write_int(batch_fd, protocol_version); + if (protocol_version >= 30) + write_byte(batch_fd, inc_recurse); write_int(batch_fd, checksum_seed); if (am_sender)