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
Use buffered I/O to read the exclude list.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
22d67ab
..
027dfea
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-120,13
+120,13
@@
void send_files(struct file_list *flist, int f_out, int f_in)
int phase = 0;
extern struct stats stats;
struct stats initial_stats;
int phase = 0;
extern struct stats stats;
struct stats initial_stats;
- extern int write_batch;
/* dw */
- extern int read_batch;
/* dw */
- int checksums_match;
/* dw */
- int buff_len;
/* dw */
- char buff[CHUNK_SIZE];
/* dw */
- int j;
/* dw */
- int done;
/* dw */
+ extern int write_batch;
+ extern int read_batch;
+ int checksums_match;
+ int buff_len;
+ char buff[CHUNK_SIZE];
+ int j;
+ int done;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
@@
-201,7
+201,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (errno == ENOENT) {
io_error |= IOERR_VANISHED;
rprintf(FINFO, "file has vanished: %s\n",
if (errno == ENOENT) {
io_error |= IOERR_VANISHED;
rprintf(FINFO, "file has vanished: %s\n",
- full_fname(fname));
+ full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "send_files failed to open %s: %s\n",
} else {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "send_files failed to open %s: %s\n",
@@
-247,7
+247,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
set_compression(fname);
set_compression(fname);
- if (read_batch) {
/* dw */
+ if (read_batch) {
/* read checksums originally computed on sender side */
read_batch_csum_info(i, s, &checksums_match);
if (checksums_match) {
/* read checksums originally computed on sender side */
read_batch_csum_info(i, s, &checksums_match);
if (checksums_match) {
@@
-288,7
+288,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
log_send(file, &initial_stats);
}
log_send(file, &initial_stats);
}
- if (!read_batch) {
/* dw */
+ if (!read_batch) {
if (buf) {
j = unmap_file(buf);
if (j) {
if (buf) {
j = unmap_file(buf);
if (j) {
@@
-313,7
+313,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
match_report();
write_int(f_out, -1);
match_report();
write_int(f_out, -1);
- if (write_batch || read_batch) {
/* dw */
+ if (write_batch || read_batch) {
close_batch_csums_file();
close_batch_delta_file();
}
close_batch_csums_file();
close_batch_delta_file();
}