X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/04c722d5e060248f6f8f01d8b9c01305c5a29d6a..8e41b68e8f975c02a5d9281be780ba5d1a385107:/io.c diff --git a/io.c b/io.c index bb4abf20..0ab9f57b 100644 --- a/io.c +++ b/io.c @@ -4,11 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2007 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,8 +17,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ /* Rsync provides its own multiplexing system, which is used to send @@ -54,6 +53,9 @@ extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; extern struct file_list *cur_flist, *first_flist; +#ifdef ICONV_OPTION +extern iconv_t ic_send, ic_recv; +#endif const char phase_unknown[] = "unknown"; int ignore_timeout = 0; @@ -92,6 +94,9 @@ 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]; +#ifdef ICONV_OPTION +static char iconv_buf[sizeof io_filesfrom_buf / 2]; +#endif static char *io_filesfrom_bp; static char io_filesfrom_lastchar; static int io_filesfrom_buflen; @@ -100,11 +105,11 @@ static int select_timeout = SELECT_TIMEOUT; static int active_filecnt = 0; static OFF_T active_bytecnt = 0; -static char int_byte_cnt[64] = { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (00 - 3F)/4 */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (40 - 7F)/4 */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* (80 - BF)/4 */ - 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */ +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 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (40 - 7F)/4 */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (80 - BF)/4 */ + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */ }; static void readfd(int fd, char *buffer, size_t N); @@ -112,6 +117,7 @@ static void writefd(int fd, const char *buf, size_t len); static void writefd_unbuffered(int fd, const char *buf, size_t len); static void decrement_active_files(int ndx); static void decrement_flist_in_progress(int ndx, int redo); +static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert); struct flist_ndx_item { struct flist_ndx_item *next; @@ -126,7 +132,7 @@ static struct flist_ndx_list redo_list, hlink_list; struct msg_list_item { struct msg_list_item *next; - int len; + char convert; char buf[1]; }; @@ -134,7 +140,7 @@ struct msg_list { struct msg_list_item *head, *tail; }; -static struct msg_list msg2sndr; +static struct msg_list msg_queue; static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { @@ -230,7 +236,7 @@ void set_msg_fd_out(int fd) } /* Add a message to the pending MSG_* list. */ -static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len) +static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len, int convert) { struct msg_list_item *m; int sz = len + 4 + sizeof m[0] - 1; @@ -238,7 +244,7 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le if (!(m = (struct msg_list_item *)new_array(char, sz))) out_of_memory("msg_list_add"); m->next = NULL; - m->len = len + 4; + m->convert = convert; SIVAL(m->buf, 0, ((code+MPLEX_BASE)<<24) | len); memcpy(m->buf + 4, buf, len); if (lst->tail) @@ -248,17 +254,33 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le lst->tail = m; } -static void msg2sndr_flush(void) -{ - while (msg2sndr.head && io_multiplexing_out) { - struct msg_list_item *m = msg2sndr.head; - if (!(msg2sndr.head = m->next)) - msg2sndr.tail = NULL; - stats.total_written += m->len; - defer_forwarding_messages = 1; - writefd_unbuffered(sock_f_out, m->buf, m->len); - defer_forwarding_messages = 0; - free(m); +static void msg_flush(void) +{ + if (am_generator) { + while (msg_queue.head && io_multiplexing_out) { + struct msg_list_item *m = msg_queue.head; + int len = IVAL(m->buf, 0) & 0xFFFFFF; + int tag = *((uchar*)m->buf+3) - MPLEX_BASE; + if (!(msg_queue.head = m->next)) + msg_queue.tail = NULL; + stats.total_written += len + 4; + defer_forwarding_messages++; + mplex_write(sock_f_out, tag, m->buf + 4, len, m->convert); + defer_forwarding_messages--; + free(m); + } + } else { + while (msg_queue.head) { + struct msg_list_item *m = msg_queue.head; + int len = IVAL(m->buf, 0) & 0xFFFFFF; + int tag = *((uchar*)m->buf+3) - MPLEX_BASE; + if (!(msg_queue.head = m->next)) + msg_queue.tail = NULL; + defer_forwarding_messages++; + mplex_write(msg_fd_out, tag, m->buf + 4, len, m->convert); + defer_forwarding_messages--; + free(m); + } } } @@ -297,7 +319,7 @@ static void read_msg_fd(void) } if (len) { readfd(fd, buf, len); - stats.total_read = read_longint(fd); + stats.total_read = read_varlong(fd, 3); } msgdone_cnt++; break; @@ -318,6 +340,10 @@ static void read_msg_fd(void) /* Read extra file list from receiver. */ assert(iobuf_in != NULL); assert(iobuf_f_in == fd); + if (verbose > 3) { + 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); break; @@ -330,7 +356,7 @@ static void read_msg_fd(void) if (len >= (int)sizeof buf || !am_generator) goto invalid_msg; readfd(fd, buf, len); - send_msg(MSG_DELETED, buf, len); + send_msg(MSG_DELETED, buf, len, 1); break; case MSG_SUCCESS: if (len != 4 || !am_generator) @@ -338,7 +364,7 @@ static void read_msg_fd(void) readfd(fd, buf, len); if (remove_source_files) { decrement_active_files(IVAL(buf,0)); - send_msg(MSG_SUCCESS, buf, len); + send_msg(MSG_SUCCESS, buf, len, 0); } if (preserve_hard_links) flist_ndx_push(&hlink_list, IVAL(buf,0)); @@ -367,7 +393,7 @@ static void read_msg_fd(void) if (n >= sizeof buf) n = sizeof buf - 1; readfd(fd, buf, n); - rwrite((enum logcode)tag, buf, n); + rwrite((enum logcode)tag, buf, n, !am_generator); len -= n; } break; @@ -380,7 +406,7 @@ static void read_msg_fd(void) no_flush--; msg_fd_in = fd; if (!--defer_forwarding_messages) - msg2sndr_flush(); + msg_flush(); } /* This is used by the generator to limit how many file transfers can @@ -398,7 +424,7 @@ void increment_active_files(int ndx, int itemizing, enum logcode code) } active_filecnt++; - active_bytecnt += F_LENGTH(cur_flist->files[ndx]); + active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]); } static void decrement_active_files(int ndx) @@ -419,13 +445,13 @@ static void decrement_flist_in_progress(int ndx, int redo) rprintf(FERROR, "Invalid file index: %d (%d - %d) [%s]\n", ndx, first_flist->ndx_start, - first_flist->prev->ndx_start + first_flist->prev->count - 1, + first_flist->prev->ndx_start + first_flist->prev->used - 1, who_am_i()); exit_cleanup(RERR_PROTOCOL); } flist = flist->prev; } - while (ndx >= flist->ndx_start + flist->count) { + while (ndx >= flist->ndx_start + flist->used) { if (!(flist = flist->next)) goto invalid_ndx; } @@ -436,14 +462,19 @@ static void decrement_flist_in_progress(int ndx, int redo) } /* Write an message to a multiplexed stream. If this fails, rsync exits. */ -static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len) +static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert) { - char buffer[1024]; + char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ size_t n = len; SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - if (n > sizeof buffer - 4) +#ifdef ICONV_OPTION + if (convert && ic_send == (iconv_t)-1) +#endif + convert = 0; + + if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ n = 0; else memcpy(buffer + 4, buf, n); @@ -453,25 +484,50 @@ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len) len -= n; buf += 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) - msg2sndr_flush(); + msg_flush(); } } -int send_msg(enum msgcode code, const char *buf, int len) +int send_msg(enum msgcode code, const char *buf, int len, int convert) { if (msg_fd_out < 0) { if (!defer_forwarding_messages) - return io_multiplex_write(code, buf, len); + return io_multiplex_write(code, buf, len, convert); if (!io_multiplexing_out) return 0; - msg_list_add(&msg2sndr, code, buf, len); + msg_list_add(&msg_queue, code, buf, len, convert); return 1; } - mplex_write(msg_fd_out, code, buf, len); + if (flist_forward_from >= 0) + msg_list_add(&msg_queue, code, buf, len, convert); + else + mplex_write(msg_fd_out, code, buf, len, convert); return 1; } @@ -479,7 +535,7 @@ void send_msg_int(enum msgcode code, int num) { char numbuf[4]; SIVAL(numbuf, 0, num); - send_msg(code, numbuf, 4); + send_msg(code, numbuf, 4, 0); } void wait_for_receiver(void) @@ -621,7 +677,7 @@ static int read_timeout(int fd, char *buf, size_t len) io_filesfrom_bp = io_filesfrom_buf; else io_filesfrom_bp += l; - } else { + } else if (errno != EINTR) { /* XXX should we complain? */ io_filesfrom_f_out = -1; } @@ -632,11 +688,13 @@ static int read_timeout(int fd, char *buf, size_t len) 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; + 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; + io_filesfrom_f_in = -1; + } } else { if (!eol_nulls) { char *s = io_filesfrom_buf + l; @@ -705,10 +763,8 @@ 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). - */ +/* 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; @@ -805,9 +861,10 @@ void io_end_buffering_out(void) iobuf_f_out = -1; } -void maybe_flush_socket(void) +void maybe_flush_socket(int important) { - if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5) + if (iobuf_out && iobuf_out_cnt + && (important || time(NULL) - last_io_out >= 5)) io_flush(NORMAL_FLUSH); } @@ -818,9 +875,9 @@ void maybe_send_keepalive(void) if (protocol_version < 29) return; /* there's nothing we can do */ if (protocol_version >= 30) - send_msg(MSG_NOOP, "", 0); + send_msg(MSG_NOOP, "", 0, 0); else { - write_int(sock_f_out, cur_flist->count); + write_int(sock_f_out, cur_flist->used); write_shortint(sock_f_out, ITEM_IS_NEW); } } @@ -917,7 +974,30 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) case MSG_DELETED: if (msg_bytes >= sizeof line) goto overflow; - read_loop(fd, line, msg_bytes); +#ifdef ICONV_OPTION + if (ic_recv != (iconv_t)-1) { + ICONV_CONST char *ibuf; + char *obuf = line; + size_t icnt, ocnt = sizeof line - 1; + int add_null = 0; + iconv(ic_send, NULL, 0, NULL, 0); + 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 + } + if (add_null) + *obuf++ = '\0'; + msg_bytes = obuf - line; + } else +#endif + read_loop(fd, line, msg_bytes); /* A directory name was sent with the trailing null */ if (msg_bytes > 0 && !line[msg_bytes-1]) log_delete(line, S_IFDIR); @@ -952,7 +1032,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) exit_cleanup(RERR_STREAMIO); } read_loop(fd, line, msg_bytes); - rwrite((enum logcode)tag, line, msg_bytes); + rwrite((enum logcode)tag, line, msg_bytes, 1); break; default: rprintf(FERROR, "unexpected tag %d [%s]\n", @@ -1012,66 +1092,96 @@ int32 read_int(int f) return num; } -int64 read_longint(int f) +int32 read_varint(int f) { - int64 num; - char b[9]; + union { + char b[5]; + int32 x; + } u; + uchar ch; + int extra; - if (protocol_version < 30) { - num = read_int(f); + u.x = 0; + readfd(f, (char*)&ch, 1); + extra = int_byte_extra[ch / 4]; + if (extra) { + uchar bit = ((uchar)1<<(8-extra)); + if (extra >= (int)sizeof u.b) { + rprintf(FERROR, "Overflow in read_varint()\n"); + exit_cleanup(RERR_STREAMIO); + } + readfd(f, u.b, extra); + u.b[extra] = ch & (bit-1); + } else + u.b[0] = ch; +#if CAREFUL_ALIGNMENT + u.x = IVAL(u.b,0); +#endif +#if SIZEOF_INT32 > 4 + if (u.x & (int32)0x80000000) + u.x |= ~(int32)0xffffffff; +#endif + return u.x; +} - if ((int32)num != (int32)0xffffffff) - return num; +int64 read_varlong(int f, uchar min_bytes) +{ + union { + char b[9]; + int64 x; + } u; + char b2[8]; + int extra; #if SIZEOF_INT64 < 8 - rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); - exit_cleanup(RERR_UNSUPPORTED); + memset(u.b, 0, 8); #else - readfd(f, b, 8); - num = IVAL(b,0) | (((int64)IVAL(b,4))<<32); + u.x = 0; #endif - } else { - int cnt; - readfd(f, b, 3); - cnt = int_byte_cnt[CVAL(b, 0) / 4]; + readfd(f, b2, min_bytes); + memcpy(u.b, b2+1, min_bytes-1); + extra = int_byte_extra[CVAL(b2, 0) / 4]; + if (extra) { + uchar bit = ((uchar)1<<(8-extra)); + if (min_bytes + extra > (int)sizeof u.b) { + rprintf(FERROR, "Overflow in read_varlong()\n"); + exit_cleanup(RERR_STREAMIO); + } + readfd(f, u.b + min_bytes - 1, extra); + u.b[min_bytes + extra - 1] = CVAL(b2, 0) & (bit-1); #if SIZEOF_INT64 < 8 - if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&0x80))) { + if (min_bytes + extra > 5 || u.b[4] || CVAL(u.b,3) & 0x80) { rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); exit_cleanup(RERR_UNSUPPORTED); } #endif - if (cnt > 3) - readfd(f, b + 3, cnt - 3); - switch (cnt) { - case 3: - num = NVAL3(b, 0); - break; - case 4: - num = NVAL4(b, 0x80); - break; - case 5: - num = NVAL5(b, 0xC0); - break; + } else + u.b[min_bytes + extra - 1] = CVAL(b2, 0); +#if SIZEOF_INT64 < 8 + u.x = IVAL(u.b,0); +#elif CAREFUL_ALIGNMENT + u.x = IVAL(u.b,0) | (((int64)IVAL(u.b,4))<<32); +#endif + return u.x; +} + +int64 read_longint(int f) +{ #if SIZEOF_INT64 >= 8 - case 6: - num = NVAL6(b, 0xE0); - break; - case 7: - num = NVAL7(b, 0xF0); - break; - case 8: - num = NVAL8(b, 0xF8); - break; - case 9: - num = NVAL8(b+1, 0); - break; + char b[9]; #endif - default: - exit_cleanup(RERR_PROTOCOL); /* impossible... */ - } - } + int32 num = read_int(f); - return num; + if (num != (int32)0xffffffff) + return num; + +#if SIZEOF_INT64 < 8 + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else + readfd(f, b, 8); + return IVAL(b,0) | (((int64)IVAL(b,4))<<32); +#endif } void read_buf(int f, char *buf, size_t len) @@ -1128,7 +1238,7 @@ void read_sum_head(int f, struct sum_struct *sum) exit_cleanup(RERR_PROTOCOL); } sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); - if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) { + if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) { rprintf(FERROR, "Invalid checksum length %d [%s]\n", sum->s2length, who_am_i()); exit_cleanup(RERR_PROTOCOL); @@ -1224,11 +1334,11 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) size_t n, total = 0; fd_set w_fds, r_fds, e_fds; int maxfd, count, cnt, using_r_fds; - int defer_save = defer_forwarding_messages; + int defer_inc = 0; struct timeval tv; if (no_flush++) - defer_forwarding_messages = 1; + defer_forwarding_messages++, defer_inc++; while (total < len) { FD_ZERO(&w_fds); @@ -1307,7 +1417,7 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } total += cnt; - defer_forwarding_messages = 1; + defer_forwarding_messages++, defer_inc++; if (fd == sock_f_out) { if (io_timeout || am_generator) @@ -1317,23 +1427,23 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } no_flush--; - if (!(defer_forwarding_messages = defer_save)) - msg2sndr_flush(); + if (!(defer_forwarding_messages -= defer_inc)) + msg_flush(); } void io_flush(int flush_it_all) { - if (flush_it_all && !defer_forwarding_messages) - msg2sndr_flush(); - if (!iobuf_out_cnt || no_flush) return; if (io_multiplexing_out) - mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt); + mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt, 0); else writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt); iobuf_out_cnt = 0; + + if (flush_it_all && !defer_forwarding_messages) + msg_flush(); } static void writefd(int fd, const char *buf, size_t len) @@ -1380,106 +1490,81 @@ void write_int(int f, int32 x) writefd(f, b, 4); } -/* - * Note: int64 may actually be a 32-bit type if ./configure couldn't find any - * 64-bit types on this platform. - */ -void write_longint(int f, int64 x) +void write_varint(int f, int32 x) { - char b[12]; + char b[5]; + uchar bit; + int cnt = 4; -#if SIZEOF_INT64 < 8 - if (x < 0 || x > 0x7FFFFFFF) { + SIVAL(b, 1, x); + + while (cnt > 1 && b[cnt] == 0) + cnt--; + bit = ((uchar)1<<(7-cnt+1)); + if (CVAL(b, cnt) >= bit) { + cnt++; + *b = ~(bit-1); + } else if (cnt > 1) + *b = b[cnt] | ~(bit*2-1); + else + *b = b[cnt]; + + writefd(f, b, cnt); +} + +void write_varlong(int f, int64 x, uchar min_bytes) +{ + char b[9]; + uchar bit; + int cnt = 8; + + SIVAL(b, 1, x); +#if SIZEOF_INT64 >= 8 + SIVAL(b, 5, x >> 32); +#else + if (x <= 0x7FFFFFFF && x >= 0) + memset(b + 5, 0, 4); + else { rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); exit_cleanup(RERR_UNSUPPORTED); } #endif - if (protocol_version < 30) { - char * const s = b+4; - SIVAL(s, 0, x); -#if SIZEOF_INT64 < 8 + while (cnt > min_bytes && b[cnt] == 0) + cnt--; + bit = ((uchar)1<<(7-cnt+min_bytes)); + if (CVAL(b, cnt) >= bit) { + cnt++; + *b = ~(bit-1); + } else if (cnt > min_bytes) + *b = b[cnt] | ~(bit*2-1); + else + *b = b[cnt]; + + writefd(f, b, cnt); +} + +/* + * Note: int64 may actually be a 32-bit type if ./configure couldn't find any + * 64-bit types on this platform. + */ +void write_longint(int f, int64 x) +{ + char b[12], * const s = b+4; + + SIVAL(s, 0, x); + if (x <= 0x7FFFFFFF && x >= 0) { writefd(f, s, 4); -#else - if (x <= 0x7FFFFFFF && x >= 0) { - writefd(f, s, 4); - return; - } + return; + } - memset(b, 0xFF, 4); - SIVAL(s, 4, x >> 32); - writefd(f, b, 12); - } else if (x < 0) { - goto all_bits; -#endif - } else if (x < ((int32)1<<(3*8-1))) { - b[0] = (char)(x >> 16); - b[1] = (char)(x >> 8); - b[2] = (char)x; - writefd(f, b, 3); - } else if (x < ((int64)1<<(4*8-2))) { - b[0] = (char)((x >> 24) | 0x80); - b[1] = (char)(x >> 16); - b[2] = (char)(x >> 8); - b[3] = (char)x; - writefd(f, b, 4); #if SIZEOF_INT64 < 8 - } else { - b[0] = 0xC0; - b[1] = (char)(x >> 24); - b[2] = (char)(x >> 16); - b[3] = (char)(x >> 8); - b[4] = (char)x; - writefd(f, b, 5); - } + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); #else - } else if (x < ((int64)1<<(5*8-3))) { - b[0] = (char)((x >> 32) | 0xC0); - b[1] = (char)(x >> 24); - b[2] = (char)(x >> 16); - b[3] = (char)(x >> 8); - b[4] = (char)x; - writefd(f, b, 5); - } else if (x < ((int64)1<<(6*8-4))) { - b[0] = (char)((x >> 40) | 0xE0); - b[1] = (char)(x >> 32); - b[2] = (char)(x >> 24); - b[3] = (char)(x >> 16); - b[4] = (char)(x >> 8); - b[5] = (char)x; - writefd(f, b, 6); - } else if (x < ((int64)1<<(7*8-5))) { - b[0] = (char)((x >> 48) | 0xF0); - b[1] = (char)(x >> 40); - b[2] = (char)(x >> 32); - b[3] = (char)(x >> 24); - b[4] = (char)(x >> 16); - b[5] = (char)(x >> 8); - b[6] = (char)x; - writefd(f, b, 7); - } else if (x < ((int64)1<<(8*8-6))) { - b[0] = (char)((x >> 56) | 0xF8); - b[1] = (char)(x >> 48); - b[2] = (char)(x >> 40); - b[3] = (char)(x >> 32); - b[4] = (char)(x >> 24); - b[5] = (char)(x >> 16); - b[6] = (char)(x >> 8); - b[7] = (char)x; - writefd(f, b, 8); - } else { - all_bits: - b[0] = (char)0xFC; - b[1] = (char)(x >> 56); - b[2] = (char)(x >> 48); - b[3] = (char)(x >> 40); - b[4] = (char)(x >> 32); - b[5] = (char)(x >> 24); - b[6] = (char)(x >> 16); - b[7] = (char)(x >> 8); - b[8] = (char)x; - writefd(f, b, 9); - } + memset(b, 0xFF, 4); + SIVAL(s, 4, x >> 32); + writefd(f, b, 12); #endif } @@ -1555,9 +1640,9 @@ void write_ndx(int f, int32 ndx) else if (diff < 0 || diff > 0x7FFF) { b[cnt++] = (char)0xFE; b[cnt++] = (char)((ndx >> 24) | 0x80); - b[cnt++] = (char)(ndx >> 16); - b[cnt++] = (char)(ndx >> 8); b[cnt++] = (char)ndx; + b[cnt++] = (char)(ndx >> 8); + b[cnt++] = (char)(ndx >> 16); } else { b[cnt++] = (char)0xFE; b[cnt++] = (char)(diff >> 8); @@ -1587,12 +1672,14 @@ int32 read_ndx(int f) if (CVAL(b, 0) == 0xFE) { readfd(f, b, 2); if (CVAL(b, 0) & 0x80) { - readfd(f, b+2, 2); - num = NVAL4(b, 0x80); + b[3] = CVAL(b, 0) & ~0x80; + b[0] = b[1]; + readfd(f, b+1, 2); + num = IVAL(b, 0); } else - num = NVAL2(b, 0) + *prev_ptr; + num = (UVAL(b,0)<<8) + UVAL(b,1) + *prev_ptr; } else - num = CVAL(b, 0) + *prev_ptr; + num = UVAL(b, 0) + *prev_ptr; *prev_ptr = num; if (prev_ptr == &prev_negative) num = -num; @@ -1662,13 +1749,13 @@ void io_start_multiplex_in(void) } /** Write an message to the multiplexed data stream. */ -int io_multiplex_write(enum msgcode code, const char *buf, size_t len) +int io_multiplex_write(enum msgcode code, const char *buf, size_t len, int convert) { if (!io_multiplexing_out) return 0; io_flush(NORMAL_FLUSH); stats.total_written += (len+4); - mplex_write(sock_f_out, code, buf, len); + mplex_write(sock_f_out, code, buf, len, convert); return 1; }