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
Needed to enclose the new symlink-warning code in an
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
51ceff4
..
d563df1
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-110,7
+110,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
{
int fd = -1;
struct sum_struct *s;
{
int fd = -1;
struct sum_struct *s;
- struct map_struct *buf = NULL;
+ struct map_struct *
m
buf = NULL;
STRUCT_STAT st;
char fname[MAXPATHLEN];
int i;
STRUCT_STAT st;
char fname[MAXPATHLEN];
int i;
@@
-201,8
+201,9
@@
void send_files(struct file_list *flist, int f_out, int f_in)
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "send_files failed to open %s: %s\n",
- full_fname(fname), strerror(errno));
+ rsyserr(FERROR, errno,
+ "send_files failed to open %s",
+ full_fname(fname));
}
free_sums(s);
continue;
}
free_sums(s);
continue;
@@
-211,21
+212,18
@@
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 |= IOERR_GENERAL;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
- r
printf(FERROR, "fstat failed: %s\n", strerror(errno)
);
+ r
syserr(FERROR, errno, "fstat failed"
);
free_sums(s);
close(fd);
return;
}
free_sums(s);
close(fd);
return;
}
- if (st.st_size > 0) {
- buf = map_file(fd, st.st_size);
- } else {
- buf = NULL;
- }
+ mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
- if (verbose > 2)
+ if (verbose > 2)
{
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
fname, (double)st.st_size);
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
fname, (double)st.st_size);
+ }
write_int(f_out, i);
write_int(f_out, i);
@@
-271,7
+269,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
}
} /* end while */
}
}
} /* end while */
- read_batch_delta_file(
buff, MD4_SUM_LENGTH);
+ read_batch_delta_file(buff, MD4_SUM_LENGTH);
write_buf(f_out, buff, MD4_SUM_LENGTH);
} /* j=i */
write_buf(f_out, buff, MD4_SUM_LENGTH);
} /* j=i */
@@
-281,18
+279,18
@@
void send_files(struct file_list *flist, int f_out, int f_in)
continue;
}
} else {
continue;
}
} else {
- match_sums(f_out, s, buf, st.st_size);
+ match_sums(f_out, s,
m
buf, st.st_size);
log_send(file, &initial_stats);
}
if (!read_batch) {
log_send(file, &initial_stats);
}
if (!read_batch) {
- if (buf) {
- j = unmap_file(buf);
+ if (
m
buf) {
+ j = unmap_file(
m
buf);
if (j) {
io_error |= IOERR_GENERAL;
if (j) {
io_error |= IOERR_GENERAL;
- r
printf(FERROR
,
-
"read errors mapping %s: (%d) %s\n
",
-
full_fname(fname), j, strerror(j
));
+ r
syserr(FERROR, j
,
+
"read errors mapping %s
",
+
full_fname(fname
));
}
}
close(fd);
}
}
close(fd);