Skip to content

L
liblongpath-rsync
Commit c1659c79 authored by Martin Pool's avatar Martin Pool
Browse files
Options

Clean up from rsync+ patch; fix compiler warning.

parent 4a7cb3e8
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 34 deletions
sender.c
View file @ c1659c79
...@@ -83,9 +83,9 @@ static struct sum_struct *receive_sums(int f) ...@@ -83,9 +83,9 @@ static struct sum_struct *receive_sums(int f)
void send_files(struct file_list *flist,int f_out,int f_in) void send_files(struct file_list *flist,int f_out,int f_in)
{ {
int fd; int fd = -1;
struct sum_struct *s; struct sum_struct *s;
struct map_struct *buf; struct map_struct *buf = NULL;
STRUCT_STAT st; STRUCT_STAT st;
char fname[MAXPATHLEN]; char fname[MAXPATHLEN];
int i; int i;
...@@ -168,44 +168,42 @@ void send_files(struct file_list *flist,int f_out,int f_in) ...@@ -168,44 +168,42 @@ void send_files(struct file_list *flist,int f_out,int f_in)
} }
if (!read_batch) { if (!read_batch) {
fd = do_open(fname, O_RDONLY, 0); fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) { if (fd == -1) {
io_error = 1; io_error = 1;
rprintf(FERROR,"send_files failed to open %s: %s\n", rprintf(FERROR,"send_files failed to open %s: %s\n",
fname,strerror(errno)); fname,strerror(errno));
free_sums(s); free_sums(s);
continue; continue;
} }
/* map the local file */ /* map the local file */
if (do_fstat(fd,&st) != 0) { if (do_fstat(fd,&st) != 0) {
io_error = 1; io_error = 1;
rprintf(FERROR,"fstat failed : %s\n",strerror(errno)); rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
free_sums(s); free_sums(s);
close(fd); close(fd);
return; return;
} }
if (st.st_size > 0) { if (st.st_size > 0) {
buf = map_file(fd,st.st_size); buf = map_file(fd,st.st_size);
} else { } else {
buf = NULL; buf = NULL;
} }
if (verbose > 2) if (verbose > 2)
rprintf(FINFO,"send_files mapped %s of size %.0f\n", rprintf(FINFO,"send_files mapped %s of size %.0f\n",
fname,(double)st.st_size); fname,(double)st.st_size);
}
if (!read_batch) { /* dw */ write_int(f_out,i);
write_int(f_out,i);
if (write_batch) if (write_batch)
write_batch_delta_file((char *)&i,sizeof(i)); write_batch_delta_file((char *)&i,sizeof(i));
write_int(f_out,s->count); write_int(f_out,s->count);
write_int(f_out,s->n); write_int(f_out,s->n);
write_int(f_out,s->remainder); write_int(f_out,s->remainder);
} }
if (verbose > 2) if (verbose > 2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment