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 variable "incremental" to "inc_recurse".
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
7bf0afc
..
e09c720
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-41,7
+41,7
@@
extern int am_server;
extern int am_daemon;
extern int am_sender;
extern int am_generator;
extern int am_daemon;
extern int am_sender;
extern int am_generator;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int io_error;
extern int eol_nulls;
extern int flist_eof;
extern int io_error;
extern int eol_nulls;
extern int flist_eof;
@@
-288,13
+288,17
@@
static void read_msg_fd(void)
switch (tag) {
case MSG_DONE:
switch (tag) {
case MSG_DONE:
- if (len
!= 0
|| !am_generator) {
+ if (len
< 0 || len > 1
|| !am_generator) {
invalid_msg:
rprintf(FERROR, "invalid message %d:%d [%s%s]\n",
tag, len, who_am_i(),
invalid_msg:
rprintf(FERROR, "invalid message %d:%d [%s%s]\n",
tag, len, who_am_i(),
- inc
remental ? "/incremental
" : "");
+ inc
_recurse ? "/inc
" : "");
exit_cleanup(RERR_STREAMIO);
}
exit_cleanup(RERR_STREAMIO);
}
+ if (len) {
+ readfd(fd, buf, len);
+ stats.total_read = read_longint(fd);
+ }
done_cnt++;
break;
case MSG_REDO:
done_cnt++;
break;
case MSG_REDO:
@@
-304,11
+308,11
@@
static void read_msg_fd(void)
if (remove_source_files)
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
if (remove_source_files)
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
- if (inc
remental
)
+ if (inc
_recurse
)
decrement_flist_in_progress(IVAL(buf,0), 1);
break;
case MSG_FLIST:
decrement_flist_in_progress(IVAL(buf,0), 1);
break;
case MSG_FLIST:
- if (len != 4 || !am_generator || !inc
remental
)
+ if (len != 4 || !am_generator || !inc
_recurse
)
goto invalid_msg;
readfd(fd, buf, 4);
/* Read extra file list from receiver. */
goto invalid_msg;
readfd(fd, buf, 4);
/* Read extra file list from receiver. */
@@
-318,7
+322,7
@@
static void read_msg_fd(void)
flist->parent_ndx = IVAL(buf,0);
break;
case MSG_FLIST_EOF:
flist->parent_ndx = IVAL(buf,0);
break;
case MSG_FLIST_EOF:
- if (len != 0 || !am_generator || !inc
remental
)
+ if (len != 0 || !am_generator || !inc
_recurse
)
goto invalid_msg;
flist_eof = 1;
break;
goto invalid_msg;
flist_eof = 1;
break;
@@
-338,14
+342,14
@@
static void read_msg_fd(void)
}
if (preserve_hard_links)
flist_ndx_push(&hlink_list, IVAL(buf,0));
}
if (preserve_hard_links)
flist_ndx_push(&hlink_list, IVAL(buf,0));
- if (inc
remental
)
+ if (inc
_recurse
)
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_NO_SEND:
if (len != 4 || !am_generator)
goto invalid_msg;
readfd(fd, buf, len);
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_NO_SEND:
if (len != 4 || !am_generator)
goto invalid_msg;
readfd(fd, buf, len);
- if (inc
remental
)
+ if (inc
_recurse
)
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_SOCKERR:
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_SOCKERR: