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]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
2ba1ab9
..
434957b
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-44,6
+44,7
@@
extern int remove_source_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
+extern int checksum_len;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
@@
-51,7
+52,8
@@
extern mode_t orig_umask;
extern struct stats stats;
extern char *tmpdir;
extern char *partial_dir;
extern struct stats stats;
extern char *tmpdir;
extern char *partial_dir;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
+extern char sender_file_sum[MAX_DIGEST_LEN];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;
@@
-163,10
+165,9
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
const char *fname, int fd, OFF_T total_size)
{
static char file_sum1[MAX_DIGEST_LEN];
const char *fname, int fd, OFF_T total_size)
{
static char file_sum1[MAX_DIGEST_LEN];
- static char file_sum2[MAX_DIGEST_LEN];
struct map_struct *mapbuf;
struct sum_struct sum;
struct map_struct *mapbuf;
struct sum_struct sum;
- int32 len
, sum_len
;
+ int32 len;
OFF_T offset = 0;
OFF_T offset2;
char *data;
OFF_T offset = 0;
OFF_T offset2;
char *data;
@@
-178,9
+179,9
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
if (fd_r >= 0 && size_r > 0) {
int32 read_size = MAX(sum.blength * 2, 16*1024);
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (fd_r >= 0 && size_r > 0) {
int32 read_size = MAX(sum.blength * 2, 16*1024);
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
- if (DEBUG_GTE(
CHK
SUM, 2)) {
- rprintf(FINFO, "recv mapped %s of size %
.0f
\n",
- fname_r,
(double)size_r
);
+ if (DEBUG_GTE(
DELTA
SUM, 2)) {
+ rprintf(FINFO, "recv mapped %s of size %
s
\n",
+ fname_r,
big_num(size_r, 0)
);
}
} else
mapbuf = NULL;
}
} else
mapbuf = NULL;
@@
-209,8
+210,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
}
offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
}
offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
- rsyserr(FERROR_XFER, errno, "lseek of %s returned %
.0f, not %.0f
",
- full_fname(fname),
(double)j, (double)offset
);
+ rsyserr(FERROR_XFER, errno, "lseek of %s returned %
s, not %s
",
+ full_fname(fname),
big_num(j, 0), big_num(offset, 0)
);
exit_cleanup(RERR_FILEIO);
}
}
exit_cleanup(RERR_FILEIO);
}
}
@@
-220,9
+221,9
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
show_progress(offset, total_size);
if (i > 0) {
show_progress(offset, total_size);
if (i > 0) {
- if (DEBUG_GTE(
CHK
SUM, 3)) {
- rprintf(FINFO,"data recv %d at %
.0f
\n",
- i,
(double)offset
);
+ if (DEBUG_GTE(
DELTA
SUM, 3)) {
+ rprintf(FINFO,"data recv %d at %
s
\n",
+ i,
big_num(offset, 0)
);
}
stats.literal_data += i;
}
stats.literal_data += i;
@@
-244,10
+245,10
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
stats.matched_data += len;
stats.matched_data += len;
- if (DEBUG_GTE(
CHK
SUM, 3)) {
+ if (DEBUG_GTE(
DELTA
SUM, 3)) {
rprintf(FINFO,
rprintf(FINFO,
- "chunk[%d] of size %ld at %
.0f offset=%.0f
\n",
- i, (long)len,
(double)offset2, (double)offset
);
+ "chunk[%d] of size %ld at %
s offset=%s
\n",
+ i, (long)len,
big_num(offset2, 0), big_num(offset, 0)
);
}
if (mapbuf) {
}
if (mapbuf) {
@@
-265,9
+266,9
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
offset += len;
if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
rsyserr(FERROR_XFER, errno,
offset += len;
if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
rsyserr(FERROR_XFER, errno,
- "lseek of %s returned %
.0f, not %.0f
",
+ "lseek of %s returned %
s, not %s
",
full_fname(fname),
full_fname(fname),
-
(double)pos, (double)offset
);
+
big_num(pos, 0), big_num(offset, 0)
);
exit_cleanup(RERR_FILEIO);
}
continue;
exit_cleanup(RERR_FILEIO);
}
continue;
@@
-296,15
+297,16
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
- sum_len = sum_end(file_sum1);
+ if (sum_end(file_sum1) != checksum_len)
+ overflow_exit("checksum_len"); /* Impossible... */
if (mapbuf)
unmap_file(mapbuf);
if (mapbuf)
unmap_file(mapbuf);
- read_buf(f_in,
file_sum2,
sum_len);
- if (DEBUG_GTE(
CHK
SUM, 2))
+ read_buf(f_in,
sender_file_sum, check
sum_len);
+ if (DEBUG_GTE(
DELTA
SUM, 2))
rprintf(FINFO,"got file_sum\n");
rprintf(FINFO,"got file_sum\n");
- if (fd != -1 && memcmp(file_sum1,
file_sum2,
sum_len) != 0)
+ if (fd != -1 && memcmp(file_sum1,
sender_file_sum, check
sum_len) != 0)
return 0;
return 1;
}
return 0;
return 1;
}