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
Changed the static file_struct var to match the changes in rsync.h.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
dd51c99
..
75f3913
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-302,11
+302,13
@@
static void read_msg_fd(void)
flist_ndx_push(&hlink_list, IVAL(buf,0));
break;
case MSG_SOCKERR:
flist_ndx_push(&hlink_list, IVAL(buf,0));
break;
case MSG_SOCKERR:
+ case MSG_CLIENT:
if (!am_generator) {
rprintf(FERROR, "invalid message %d:%d\n", tag, len);
exit_cleanup(RERR_STREAMIO);
}
if (!am_generator) {
rprintf(FERROR, "invalid message %d:%d\n", tag, len);
exit_cleanup(RERR_STREAMIO);
}
- close_multiplexing_out();
+ if (tag == MSG_SOCKERR)
+ close_multiplexing_out();
/* FALL THROUGH */
case MSG_INFO:
case MSG_ERROR:
/* FALL THROUGH */
case MSG_INFO:
case MSG_ERROR:
@@
-336,19
+338,21
@@
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
/* TODO: tune these limits? */
while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
{
/* TODO: tune these limits? */
while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
+#ifdef SUPPORT_HARD_LINKS
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
+#endif
read_msg_fd();
}
active_filecnt++;
read_msg_fd();
}
active_filecnt++;
- active_bytecnt +=
the_file_list->files[ndx]->length
;
+ active_bytecnt +=
F_LENGTH(the_file_list->files[ndx])
;
}
void decrement_active_files(int ndx)
{
active_filecnt--;
}
void decrement_active_files(int ndx)
{
active_filecnt--;
- active_bytecnt -=
the_file_list->files[ndx]->length
;
+ active_bytecnt -=
F_LENGTH(the_file_list->files[ndx])
;
}
/* Try to push messages off the list onto the wire. If we leave with more
}
/* Try to push messages off the list onto the wire. If we leave with more
@@
-405,11
+409,20
@@
int send_msg(enum msgcode code, const char *buf, int len)
return 1;
}
return 1;
}
+void send_msg_int(enum msgcode code, int num)
+{
+ char numbuf[4];
+ SIVAL(numbuf, 0, num);
+ send_msg(code, numbuf, 4);
+}
+
int get_redo_num(int itemizing, enum logcode code)
{
while (1) {
int get_redo_num(int itemizing, enum logcode code)
{
while (1) {
+#ifdef SUPPORT_HARD_LINKS
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
+#endif
if (redo_list.head)
break;
read_msg_fd();
if (redo_list.head)
break;
read_msg_fd();
@@
-917,6
+930,12
@@
int64 read_longint(int f)
int cnt;
readfd(f, b, 3);
cnt = int_byte_cnt[CVAL(b, 0)];
int cnt;
readfd(f, b, 3);
cnt = int_byte_cnt[CVAL(b, 0)];
+#if SIZEOF_INT64 < 8
+ if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&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) {
if (cnt > 3)
readfd(f, b + 3, cnt - 3);
switch (cnt) {
@@
-929,6
+948,7
@@
int64 read_longint(int f)
case 5:
num = NVAL5(b, 0xC0);
break;
case 5:
num = NVAL5(b, 0xC0);
break;
+#if SIZEOF_INT64 >= 8
case 6:
num = NVAL6(b, 0xE0);
break;
case 6:
num = NVAL6(b, 0xE0);
break;
@@
-941,8
+961,9
@@
int64 read_longint(int f)
case 9:
num = NVAL8(b+1, 0);
break;
case 9:
num = NVAL8(b+1, 0);
break;
+#endif
default:
default:
- exit_cleanup(RERR_PROTOCOL); /
/ XXX impossible
+ exit_cleanup(RERR_PROTOCOL); /
* impossible... */
}
}
}
}
@@
-1344,6
+1365,16
@@
void write_longint(int f, int64 x)
b[2] = (char)(x >> 8);
b[3] = (char)x;
writefd(f, b, 4);
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);
+ }
+#else
} else if (x < ((int64)1<<(5*8-3))) {
b[0] = (char)((x >> 32) | 0xC0);
b[1] = (char)(x >> 24);
} else if (x < ((int64)1<<(5*8-3))) {
b[0] = (char)((x >> 32) | 0xC0);
b[1] = (char)(x >> 24);
@@
-1351,7
+1382,6
@@
void write_longint(int f, int64 x)
b[3] = (char)(x >> 8);
b[4] = (char)x;
writefd(f, b, 5);
b[3] = (char)(x >> 8);
b[4] = (char)x;
writefd(f, b, 5);
-#if SIZEOF_INT64 >= 8
} else if (x < ((int64)1<<(6*8-4))) {
b[0] = (char)((x >> 40) | 0xE0);
b[1] = (char)(x >> 32);
} else if (x < ((int64)1<<(6*8-4))) {
b[0] = (char)((x >> 40) | 0xE0);
b[1] = (char)(x >> 32);
@@
-1391,8
+1421,8
@@
void write_longint(int f, int64 x)
b[7] = (char)(x >> 8);
b[8] = (char)x;
writefd(f, b, 9);
b[7] = (char)(x >> 8);
b[8] = (char)x;
writefd(f, b, 9);
-#endif
}
}
+#endif
}
void write_buf(int f, const char *buf, size_t len)
}
void write_buf(int f, const char *buf, size_t len)