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
Updated exit codes as Jon Jensen and J.W. suggested.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
841e81f
..
3d39052
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-38,16
+38,14
@@
extern int am_server;
void read_sum_head(int f, struct sum_struct *sum)
{
void read_sum_head(int f, struct sum_struct *sum)
{
- extern int
remote
_version;
+ extern int
protocol
_version;
sum->count = read_int(f);
sum->blength = read_int(f);
sum->count = read_int(f);
sum->blength = read_int(f);
- if (remote_version < 27)
- {
+ if (protocol_version < 27)
sum->s2length = csum_length;
sum->s2length = csum_length;
- } else {
+ else
sum->s2length = read_int(f);
sum->s2length = read_int(f);
- }
sum->remainder = read_int(f);
}
sum->remainder = read_int(f);
}
@@
-160,7
+158,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (strlen(fname) == MAXPATHLEN-1) {
io_error = 1;
rprintf(FERROR, "send_files failed on long-named directory %s\n",
if (strlen(fname) == MAXPATHLEN-1) {
io_error = 1;
rprintf(FERROR, "send_files failed on long-named directory %s\n",
- f
name
);
+ f
ull_fname(fname)
);
return;
}
strlcat(fname, "/", MAXPATHLEN);
return;
}
strlcat(fname, "/", MAXPATHLEN);
@@
-196,7
+194,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (fd == -1) {
io_error = 1;
rprintf(FERROR, "send_files failed to open %s: %s\n",
if (fd == -1) {
io_error = 1;
rprintf(FERROR, "send_files failed to open %s: %s\n",
- f
name
, strerror(errno));
+ f
ull_fname(fname)
, strerror(errno));
free_sums(s);
continue;
}
free_sums(s);
continue;
}
@@
-204,7
+202,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error = 1;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error = 1;
- rprintf(FERROR, "fstat failed
: %s\n", strerror(errno));
+ rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
free_sums(s);
close(fd);
return;
free_sums(s);
close(fd);
return;
@@
-279,7
+277,17
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
if (!read_batch) { /* dw */
}
if (!read_batch) { /* dw */
- if (buf) unmap_file(buf);
+ if (buf) {
+ j = unmap_file(buf);
+ if (j) {
+ io_error = 1;
+ rprintf(FERROR,
+ "read errors mapping %s: (%d) %s\n",
+ full_fname(fname),
+ j,
+ strerror(j));
+ }
+ }
close(fd);
}
close(fd);
}