X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1b7c47cb550e7600a66528c9cbd4bc1e880fb91e..82471e68a8bb3da8ca95f2b6564c330c52ce891e:/sender.c diff --git a/sender.c b/sender.c index 79eb1c8c..741a8d24 100644 --- a/sender.c +++ b/sender.c @@ -1,17 +1,17 @@ -/* +/* Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -20,58 +20,73 @@ #include "rsync.h" extern int verbose; -extern int remote_version; extern int csum_length; extern struct stats stats; extern int io_error; extern int dry_run; extern int am_server; +extern int am_daemon; +extern int protocol_version; +extern int updating_basis_file; +extern int make_backups; +extern int inplace; +extern struct stats stats; -/* - receive the checksums for a buffer - */ +/** + * @file + * + * The sender gets checksums from the generator, calculates deltas, + * and transmits them to the receiver. The sender process runs on the + * machine holding the source files. + **/ + +/** + * Receive the checksums for a buffer + **/ static struct sum_struct *receive_sums(int f) { struct sum_struct *s; int i; OFF_T offset = 0; - s = (struct sum_struct *)malloc(sizeof(*s)); - if (!s) out_of_memory("receive_sums"); + if (!(s = new(struct sum_struct))) + out_of_memory("receive_sums"); + + read_sum_head(f, s); - s->count = read_int(f); - s->n = read_int(f); - s->remainder = read_int(f); s->sums = NULL; - if (verbose > 3) - rprintf(FINFO,"count=%d n=%d rem=%d\n", - s->count,s->n,s->remainder); + if (verbose > 3) { + rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n", + (double)s->count, (long)s->blength, (long)s->remainder); + } - if (s->count == 0) + if (s->count == 0) return(s); - s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count); - if (!s->sums) out_of_memory("receive_sums"); + if (!(s->sums = new_array(struct sum_buf, s->count))) + out_of_memory("receive_sums"); - for (i=0;icount;i++) { + for (i = 0; i < (int)s->count; i++) { s->sums[i].sum1 = read_int(f); - read_buf(f,s->sums[i].sum2,csum_length); + read_buf(f, s->sums[i].sum2, s->s2length); s->sums[i].offset = offset; - s->sums[i].i = i; + s->sums[i].flags = 0; - if (i == s->count-1 && s->remainder != 0) { + if (i == (int)s->count-1 && s->remainder != 0) s->sums[i].len = s->remainder; - } else { - s->sums[i].len = s->n; - } + else + s->sums[i].len = s->blength; offset += s->sums[i].len; - if (verbose > 3) - rprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n", - i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1); + if (verbose > 3) { + rprintf(FINFO, + "chunk[%d] len=%d offset=%.0f sum1=%08x\n", + i, s->sums[i].len, (double)s->sums[i].offset, + s->sums[i].sum1); + } } s->flength = offset; @@ -81,148 +96,165 @@ static struct sum_struct *receive_sums(int f) -void send_files(struct file_list *flist,int f_out,int f_in) -{ - int fd; +void send_files(struct file_list *flist, int f_out, int f_in) +{ + int fd = -1; struct sum_struct *s; - struct map_struct *buf; + struct map_struct *mbuf = NULL; STRUCT_STAT st; - char fname[MAXPATHLEN]; + char *fname2, fname[MAXPATHLEN]; int i; struct file_struct *file; int phase = 0; - extern struct stats stats; struct stats initial_stats; + int save_make_backups = make_backups; + int j; if (verbose > 2) - rprintf(FINFO,"send_files starting\n"); - - setup_readbuffer(f_in); + rprintf(FINFO, "send_files starting\n"); while (1) { - int offset=0; + unsigned int offset; i = read_int(f_in); if (i == -1) { - if (phase==0 && remote_version >= 13) { + if (phase == 0) { phase++; csum_length = SUM_LENGTH; - write_int(f_out,-1); + write_int(f_out, -1); if (verbose > 2) - rprintf(FINFO,"send_files phase=%d\n",phase); + rprintf(FINFO, "send_files phase=%d\n", phase); + /* For inplace: redo phase turns off the backup + * flag so that we do a regular inplace send. */ + make_backups = 0; continue; } break; } if (i < 0 || i >= flist->count) { - rprintf(FERROR,"Invalid file index %d (count=%d)\n", + rprintf(FERROR, "Invalid file index %d (count=%d)\n", i, flist->count); - exit_cleanup(1); + exit_cleanup(RERR_PROTOCOL); } file = flist->files[i]; + stats.current_file_index = i; stats.num_transferred_files++; stats.total_transferred_size += file->length; - fname[0] = 0; if (file->basedir) { - strlcpy(fname,file->basedir,MAXPATHLEN-1); - if (strlen(fname) == MAXPATHLEN-1) { - io_error = 1; - rprintf(FERROR, "send_files failed on long-named directory %s\n", - fname); - return; - } - strlcat(fname,"/",MAXPATHLEN-1); - offset = strlen(file->basedir)+1; - } - strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname)); - - if (verbose > 2) - rprintf(FINFO,"send_files(%d,%s)\n",i,fname); - - if (dry_run) { - if (!am_server) { - log_transfer(file, fname+offset); - } - write_int(f_out,i); + /* N.B. We're sure that this fits, so offset is OK. */ + offset = strlcpy(fname, file->basedir, sizeof fname); + if (!offset || fname[offset-1] != '/') + fname[offset++] = '/'; + } else + offset = 0; + fname2 = f_name_to(file, fname + offset); + if (inplace && protocol_version >= 29) { + uchar fnamecmp_type = read_byte(f_in); + updating_basis_file = fnamecmp_type == FNAMECMP_FNAME; + } else + updating_basis_file = inplace && !make_backups; + + if (verbose > 2) + rprintf(FINFO, "send_files(%d, %s)\n", i, fname); + + if (dry_run) { + if (!am_server && verbose) /* log the transfer */ + rprintf(FINFO, "%s\n", safe_fname(fname2)); + write_int(f_out, i); continue; } initial_stats = stats; - s = receive_sums(f_in); - if (!s) { - io_error = 1; - rprintf(FERROR,"receive_sums failed\n"); + if (!(s = receive_sums(f_in))) { + io_error |= IOERR_GENERAL; + rprintf(FERROR, "receive_sums failed\n"); return; } - - fd = open(fname,O_RDONLY); + + fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { - io_error = 1; - rprintf(FERROR,"send_files failed to open %s: %s\n", - fname,strerror(errno)); + if (errno == ENOENT) { + enum logcode c = am_daemon + && protocol_version < 28 ? FERROR + : FINFO; + io_error |= IOERR_VANISHED; + rprintf(c, "file has vanished: %s\n", + full_fname(fname)); + } else { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, errno, + "send_files failed to open %s", + full_fname(fname)); + } free_sums(s); continue; } - + /* map the local file */ - if (do_fstat(fd,&st) != 0) { - io_error = 1; - rprintf(FERROR,"fstat failed : %s\n",strerror(errno)); + if (do_fstat(fd, &st) != 0) { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, errno, "fstat failed"); free_sums(s); close(fd); return; } - - if (st.st_size > 0) { - buf = map_file(fd,st.st_size); - } else { - buf = NULL; + + if (st.st_size) { + int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE); + mbuf = map_file(fd, st.st_size, read_size, s->blength); + } else + mbuf = NULL; + + if (verbose > 2) { + rprintf(FINFO, "send_files mapped %s of size %.0f\n", + safe_fname(fname), (double)st.st_size); } - - if (verbose > 2) - rprintf(FINFO,"send_files mapped %s of size %d\n", - fname,(int)st.st_size); - - write_int(f_out,i); - - write_int(f_out,s->count); - write_int(f_out,s->n); - write_int(f_out,s->remainder); - - if (verbose > 2) - rprintf(FINFO,"calling match_sums %s\n",fname); - - if (!am_server) { - log_transfer(file, fname+offset); + + write_int(f_out, i); + write_sum_head(f_out, s); + + if (verbose > 2) { + rprintf(FINFO, "calling match_sums %s\n", + safe_fname(fname)); } - - match_sums(f_out,s,buf,st.st_size); + if (!am_server && verbose) /* log the transfer */ + rprintf(FINFO, "%s\n", safe_fname(fname2)); + + set_compression(fname); + + match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); - - if (buf) unmap_file(buf); + + if (mbuf) { + j = unmap_file(mbuf); + if (j) { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, j, + "read errors mapping %s", + full_fname(fname)); + } + } close(fd); - + free_sums(s); - - if (verbose > 2) - rprintf(FINFO,"sender finished %s\n",fname); + + if (verbose > 2) { + rprintf(FINFO, "sender finished %s\n", + safe_fname(fname)); + } } + make_backups = save_make_backups; if (verbose > 2) - rprintf(FINFO,"send files finished\n"); + rprintf(FINFO, "send files finished\n"); match_report(); - write_int(f_out,-1); + write_int(f_out, -1); } - - - - -