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
Improved var-checker and tweaked all the issues it found.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
d29643d
..
7cf272e
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-36,7
+36,6
@@
extern int bwlimit;
extern size_t bwlimit_writemax;
extern int io_timeout;
extern int bwlimit;
extern size_t bwlimit_writemax;
extern int io_timeout;
-extern int allowed_lull;
extern int am_server;
extern int am_daemon;
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_sender;
@@
-47,7
+46,6
@@
extern int eol_nulls;
extern int flist_eof;
extern int list_only;
extern int read_batch;
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 protect_args;
extern int checksum_seed;
extern int protocol_version;
@@
-60,7
+58,8
@@
extern int filesfrom_convert;
extern iconv_t ic_send, ic_recv;
#endif
extern iconv_t ic_send, ic_recv;
#endif
-const char phase_unknown[] = "unknown";
+int csum_length = SHORT_SUM_LENGTH; /* initial value */
+int allowed_lull = 0;
int ignore_timeout = 0;
int batch_fd = -1;
int msgdone_cnt = 0;
int ignore_timeout = 0;
int batch_fd = -1;
int msgdone_cnt = 0;
@@
-352,8
+351,7
@@
static void check_for_d_option_error(const char *msg)
if (saw_d) {
rprintf(FWARNING,
if (saw_d) {
rprintf(FWARNING,
- "*** Try adding \"-r --exclude='/*/*'\" "
- "if remote rsync is <= 2.6.3 ***\n");
+ "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n");
}
}
}
}
@@
-409,7
+407,7
@@
static void read_msg_fd(void)
/* Read extra file list from receiver. */
assert(iobuf_in != NULL);
assert(iobuf_f_in == fd);
/* 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));
}
rprintf(FINFO, "[%s] receiving flist for dir %d\n",
who_am_i(), IVAL(buf,0));
}
@@
-630,8
+628,8
@@
static void whine_about_eof(int fd)
}
rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed "
}
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);
}
exit_cleanup(RERR_STREAMIO);
}
@@
-1355,6
+1353,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)
{
* 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",
sum->count = read_int(f);
if (sum->count < 0) {
rprintf(FERROR, "Invalid checksum count %ld [%s]\n",
@@
-1362,7
+1361,7
@@
void read_sum_head(int f, struct sum_struct *sum)
exit_cleanup(RERR_PROTOCOL);
}
sum->blength = read_int(f);
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);
rprintf(FERROR, "Invalid block length %ld [%s]\n",
(long)sum->blength, who_am_i());
exit_cleanup(RERR_PROTOCOL);