X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a261989cda6f671352e6323f11d2d98e923c622e..2c713fcdfa04eb7d58c67a4a51d4cbdc37f78536:/receiver.c diff --git a/receiver.c b/receiver.c index 6b6b63a5..ac8f26bb 100644 --- a/receiver.c +++ b/receiver.c @@ -1,18 +1,18 @@ /* -*- c-file-style: "linux" -*- - + Copyright (C) 1996-2000 by Andrew Tridgell 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. @@ -23,95 +23,71 @@ extern int verbose; extern int recurse; extern int delete_mode; -extern int remote_version; +extern int delete_after; +extern int max_delete; extern int csum_length; extern struct stats stats; extern int dry_run; extern int am_server; extern int relative_paths; +extern int keep_dirlinks; extern int preserve_hard_links; +extern int preserve_perms; extern int cvs_exclude; extern int io_error; extern char *tmpdir; extern char *compare_dest; extern int make_backups; +extern int do_progress; +extern char *backup_dir; extern char *backup_suffix; - -static struct delete_list { - DEV64_T dev; - INO64_T inode; -} *delete_list; -static int dlist_len, dlist_alloc_len; - -/* yuck! This function wouldn't have been necessary if I had the sorting - algorithm right. Unfortunately fixing the sorting algorithm would introduce - a backward incompatibility as file list indexes are sent over the link. -*/ -static int delete_already_done(struct file_list *flist,int j) +extern int backup_suffix_len; +extern int cleanup_got_literal; +extern int module_id; +extern int ignore_errors; +extern int orig_umask; +extern int keep_partial; +extern int checksum_seed; + +static void delete_one(char *fn, int is_dir) { - int i; - STRUCT_STAT st; - - if (link_stat(f_name(flist->files[j]), &st)) return 1; - - for (i=0;idev; - delete_list[dlist_len].inode = file->inode; - dlist_len++; - if (verbose > 3) - rprintf(FINFO,"added %s to delete list\n", f_name(file)); -} - -static void delete_one(struct file_struct *f) +static int is_backup_file(char *fn) { - if (!S_ISDIR(f->mode)) { - if (robust_unlink(f_name(f)) != 0) { - rprintf(FERROR,"delete_one: unlink %s: %s\n",f_name(f),strerror(errno)); - } else if (verbose) { - rprintf(FINFO,"deleting %s\n",f_name(f)); - } - } else { - if (do_rmdir(f_name(f)) != 0) { - if (errno != ENOTEMPTY && errno != EEXIST) - rprintf(FERROR,"delete_one: rmdir %s: %s\n", - f_name(f), strerror(errno)); - } else if (verbose) { - rprintf(FINFO,"deleting directory %s\n",f_name(f)); - } - } + int k = strlen(fn) - backup_suffix_len; + return k > 0 && strcmp(fn+k, backup_suffix) == 0; } - - -/* this deletes any files on the receiving side that are not present - on the sending side. For version 1.6.4 I have changed the behaviour - to match more closely what most people seem to expect of this option */ +/* This deletes any files on the receiving side that are not present + * on the sending side. */ void delete_files(struct file_list *flist) { struct file_list *local_file_list; int i, j; - char *name; - extern int module_id; - extern int ignore_errors; - extern int max_delete; + char *argv[1], fbuf[MAXPATHLEN]; static int deletion_count; if (cvs_exclude) @@ -122,112 +98,125 @@ void delete_files(struct file_list *flist) return; } - for (j=0;jcount;j++) { - if (!S_ISDIR(flist->files[j]->mode) || - !(flist->files[j]->flags & FLAG_DELETE)) continue; - - if (remote_version < 19 && - delete_already_done(flist, j)) continue; + for (j = 0; j < flist->count; j++) { + if (!(flist->files[j]->flags & FLAG_TOP_DIR) + || !S_ISDIR(flist->files[j]->mode)) + continue; - name = strdup(f_name(flist->files[j])); + argv[0] = f_name_to(flist->files[j], fbuf); - if (!(local_file_list = send_file_list(-1,1,&name))) { - free(name); + if (!(local_file_list = send_file_list(-1, 1, argv))) continue; - } if (verbose > 1) - rprintf(FINFO,"deleting in %s\n", name); - - for (i=local_file_list->count-1;i>=0;i--) { - if (max_delete && deletion_count > max_delete) break; - if (!local_file_list->files[i]->basename) continue; - if (remote_version < 19 && - S_ISDIR(local_file_list->files[i]->mode)) - add_delete_entry(local_file_list->files[i]); - if (-1 == flist_find(flist,local_file_list->files[i])) { + rprintf(FINFO, "deleting in %s\n", fbuf); + + for (i = local_file_list->count-1; i >= 0; i--) { + if (max_delete && deletion_count > max_delete) + break; + if (!local_file_list->files[i]->basename) + continue; + if (flist_find(flist,local_file_list->files[i]) < 0) { char *f = f_name(local_file_list->files[i]); - int k = strlen(f) - strlen(backup_suffix); -/* Hi Andrew, do we really need to play with backup_suffix here? */ - if (make_backups && ((k <= 0) || - (strcmp(f+k,backup_suffix) != 0))) { - (void) make_backup(f); + if (make_backups && (backup_dir || !is_backup_file(f))) { + make_backup(f); + if (verbose) + rprintf(FINFO, "deleting %s\n", f); } else { - deletion_count++; - delete_one(local_file_list->files[i]); + int mode = local_file_list->files[i]->mode; + delete_one(f, S_ISDIR(mode) != 0); } + deletion_count++; } } flist_free(local_file_list); - free(name); } } +/* + * get_tmpname() - create a tmp filename for a given filename + * + * If a tmpdir is defined, use that as the directory to + * put it in. Otherwise, the tmp filename is in the same + * directory as the given name. Note that there may be no + * directory at all in the given name! + * + * The tmp filename is basically the given filename with a + * dot prepended, and .XXXXXX appended (for mkstemp() to + * put its unique gunk in). Take care to not exceed + * either the MAXPATHLEN or NAME_MAX, esp. the last, as + * the basename basically becomes 8 chars longer. In that + * case, the original name is shortened sufficiently to + * make it all fit. + * + * Of course, there's no real reason for the tmp name to + * look like the original, except to satisfy us humans. + * As long as it's unique, rsync will work. + */ + static int get_tmpname(char *fnametmp, char *fname) { char *f; + int length = 0; + int maxname; - /* open tmp file */ if (tmpdir) { - f = strrchr(fname,'/'); - if (f == NULL) - f = fname; - else - f++; - if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) { - rprintf(FERROR,"filename too long\n"); - return 0; + /* Note: this can't overflow, so the return value is safe */ + length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2); + fnametmp[length++] = '/'; + fnametmp[length] = '\0'; /* always NULL terminated */ + } + + if ((f = strrchr(fname, '/')) != NULL) { + ++f; + if (!tmpdir) { + length = f - fname; + /* copy up to and including the slash */ + strlcpy(fnametmp, fname, length + 1); } - snprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f); - return 1; - } + } else + f = fname; + fnametmp[length++] = '.'; + fnametmp[length] = '\0'; /* always NULL terminated */ - f = strrchr(fname,'/'); + maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8); - if (strlen(fname)+9 > MAXPATHLEN) { - rprintf(FERROR,"filename too long\n"); + if (maxname < 1) { + rprintf(FERROR, "temporary filename too long: %s\n", fname); + fnametmp[0] = '\0'; return 0; } - if (f) { - *f = 0; - snprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX", - fname,f+1); - *f = '/'; - } else { - snprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname); - } + strlcpy(fnametmp + length, f, maxname); + strcat(fnametmp + length, ".XXXXXX"); return 1; } -static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, +static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, OFF_T total_size) { int i; - unsigned int n,remainder,len,count; + struct sum_struct sum; + unsigned int len; OFF_T offset = 0; OFF_T offset2; char *data; static char file_sum1[MD4_SUM_LENGTH]; static char file_sum2[MD4_SUM_LENGTH]; - char *map=NULL; - - count = read_int(f_in); - n = read_int(f_in); - remainder = read_int(f_in); - - sum_init(); - - for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) { - - show_progress(offset, total_size); + char *map = NULL; - if (i > 0) { - extern int cleanup_got_literal; + read_sum_head(f_in, &sum); + + sum_init(checksum_seed); + + while ((i = recv_token(f_in, &data)) != 0) { + if (do_progress) + show_progress(offset, total_size); + if (i > 0) { if (verbose > 3) { rprintf(FINFO,"data recv %d at %.0f\n", i,(double)offset); @@ -235,129 +224,132 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, stats.literal_data += i; cleanup_got_literal = 1; - + sum_update(data,i); if (fd != -1 && write_file(fd,data,i) != i) { - rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno)); + rsyserr(FERROR, errno, "write failed on %s", + full_fname(fname)); exit_cleanup(RERR_FILEIO); } offset += i; continue; - } + } i = -(i+1); - offset2 = i*(OFF_T)n; - len = n; - if (i == (int) count-1 && remainder != 0) - len = remainder; - + offset2 = i*(OFF_T)sum.blength; + len = sum.blength; + if (i == (int)sum.count-1 && sum.remainder != 0) + len = sum.remainder; + stats.matched_data += len; - + if (verbose > 3) rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n", i,len,(double)offset2,(double)offset); - - if (buf) { - map = map_ptr(buf,offset2,len); - + + if (mapbuf) { + map = map_ptr(mapbuf,offset2,len); + see_token(map, len); sum_update(map,len); } - - if (fd != -1 && write_file(fd,map,len) != (int) len) { - rprintf(FERROR,"write failed on %s : %s\n", - fname,strerror(errno)); + + if (fd != -1 && write_file(fd, map, len) != (int)len) { + rsyserr(FERROR, errno, "write failed on %s", + full_fname(fname)); exit_cleanup(RERR_FILEIO); } offset += len; } - end_progress(total_size); + flush_write_file(fd); + + if (do_progress) + end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { - rprintf(FERROR,"write failed on %s : %s\n", - fname,strerror(errno)); + rsyserr(FERROR, errno, "write failed on %s", + full_fname(fname)); exit_cleanup(RERR_FILEIO); } sum_end(file_sum1); - if (remote_version >= 14) { - read_buf(f_in,file_sum2,MD4_SUM_LENGTH); - if (verbose > 2) { - rprintf(FINFO,"got file_sum\n"); - } - if (fd != -1 && - memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) { - return 0; - } - } + read_buf(f_in,file_sum2,MD4_SUM_LENGTH); + if (verbose > 2) + rprintf(FINFO,"got file_sum\n"); + if (fd != -1 && memcmp(file_sum1, file_sum2, MD4_SUM_LENGTH) != 0) + return 0; return 1; } -/* main routine for receiver process. Receiver process runs on the - same host as the generator process. */ - -int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) -{ +/** + * main routine for receiver process. + * + * Receiver process runs on the same host as the generator process. */ +int recv_files(int f_in, struct file_list *flist, char *local_name) +{ int fd1,fd2; STRUCT_STAT st; - char *fname; + char *fname, fbuf[MAXPATHLEN]; char template[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; char *fnamecmp; char fnamecmpbuf[MAXPATHLEN]; - struct map_struct *buf; - int i; + struct map_struct *mapbuf; struct file_struct *file; - int phase=0; - int recv_ok; - extern struct stats stats; - extern int preserve_perms; - extern int delete_after; struct stats initial_stats; + int save_make_backups = make_backups; + int i, recv_ok, phase = 0; - if (verbose > 2) { + if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); + + if (flist->hlink_pool) { + pool_destroy(flist->hlink_pool); + flist->hlink_pool = NULL; } - while (1) { + while (1) { cleanup_disable(); i = read_int(f_in); if (i == -1) { - if (phase==0 && remote_version >= 13) { - phase++; - csum_length = SUM_LENGTH; - if (verbose > 2) - rprintf(FINFO,"recv_files phase=%d\n",phase); - write_int(f_gen,-1); - continue; - } - break; + if (phase) + break; + phase = 1; + csum_length = SUM_LENGTH; + if (verbose > 2) + rprintf(FINFO, "recv_files phase=%d\n", phase); + send_msg(MSG_DONE, "", 0); + if (keep_partial) + make_backups = 0; /* prevents double backup */ + continue; } if (i < 0 || i >= flist->count) { - rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", + rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", i, flist->count); exit_cleanup(RERR_PROTOCOL); } file = flist->files[i]; - fname = f_name(file); + stats.current_file_index = i; stats.num_transferred_files++; stats.total_transferred_size += file->length; + cleanup_got_literal = 0; if (local_name) fname = local_name; + else + fname = f_name_to(file, fbuf); if (dry_run) { - if (!am_server) { - log_transfer(file, fname); - } + if (!am_server && verbose) + rprintf(FINFO, "%s\n", fname); continue; } @@ -368,140 +360,145 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) fnamecmp = fname; - /* open the file */ + /* open the file */ fd1 = do_open(fnamecmp, O_RDONLY, 0); - if ((fd1 == -1) && (compare_dest != NULL)) { + if (fd1 == -1 && compare_dest != NULL) { /* try the file at compare_dest instead */ - snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s", - compare_dest,fname); + pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, + compare_dest, fname); fnamecmp = fnamecmpbuf; fd1 = do_open(fnamecmp, O_RDONLY, 0); } if (fd1 != -1 && do_fstat(fd1,&st) != 0) { - rprintf(FERROR,"fstat %s : %s\n",fnamecmp,strerror(errno)); + rsyserr(FERROR, errno, "fstat %s failed", + full_fname(fnamecmp)); receive_data(f_in,NULL,-1,NULL,file->length); close(fd1); continue; } - if (fd1 != -1 && !S_ISREG(st.st_mode)) { - rprintf(FERROR,"%s : not a regular file (recv_files)\n",fnamecmp); - receive_data(f_in,NULL,-1,NULL,file->length); + if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) { + /* this special handling for directories + * wouldn't be necessary if robust_rename() + * and the underlying robust_unlink could cope + * with directories + */ + rprintf(FERROR,"recv_files: %s is a directory\n", + full_fname(fnamecmp)); + receive_data(f_in, NULL, -1, NULL, file->length); close(fd1); continue; } + if (fd1 != -1 && !S_ISREG(st.st_mode)) { + close(fd1); + fd1 = -1; + mapbuf = NULL; + } + if (fd1 != -1 && !preserve_perms) { - /* if the file exists already and we aren't perserving - presmissions then act as though the remote end sent - us the file permissions we already have */ + /* if the file exists already and we aren't preserving + * permissions then act as though the remote end sent + * us the file permissions we already have */ file->mode = st.st_mode; } if (fd1 != -1 && st.st_size > 0) { - buf = map_file(fd1,st.st_size); - if (verbose > 2) - rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); - } else { - buf = NULL; - } + mapbuf = map_file(fd1,st.st_size); + if (verbose > 2) { + rprintf(FINFO, "recv mapped %s of size %.0f\n", + fnamecmp, (double)st.st_size); + } + } else + mapbuf = NULL; if (!get_tmpname(fnametmp,fname)) { - if (buf) unmap_file(buf); - if (fd1 != -1) close(fd1); + if (mapbuf) + unmap_file(mapbuf); + if (fd1 != -1) + close(fd1); continue; } - strlcpy(template, fnametmp, sizeof(template)); + strlcpy(template, fnametmp, sizeof template); /* we initially set the perms without the - setuid/setgid bits to ensure that there is no race - condition. They are then correctly updated after - the lchown. Thanks to snabb@epipe.fi for pointing - this out. We also set it initially without group - access because of a similar race condition. */ + * setuid/setgid bits to ensure that there is no race + * condition. They are then correctly updated after + * the lchown. Thanks to snabb@epipe.fi for pointing + * this out. We also set it initially without group + * access because of a similar race condition. */ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); - if (fd2 == -1) { - rprintf(FERROR,"mkstemp %s failed\n",fnametmp); - receive_data(f_in,buf,-1,NULL,file->length); - if (buf) unmap_file(buf); - continue; - } /* in most cases parent directories will already exist - because their information should have been previously - transferred, but that may not be the case with -R */ - if (fd2 == -1 && relative_paths && errno == ENOENT && - create_directory_path(fnametmp) == 0) { - strlcpy(fnametmp, template, sizeof(fnametmp)); + * because their information should have been previously + * transferred, but that may not be the case with -R */ + if (fd2 == -1 && relative_paths && errno == ENOENT && + create_directory_path(fnametmp, orig_umask) == 0) { + strlcpy(fnametmp, template, sizeof fnametmp); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); } if (fd2 == -1) { - rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno)); - receive_data(f_in,buf,-1,NULL,file->length); - if (buf) unmap_file(buf); - if (fd1 != -1) close(fd1); + rsyserr(FERROR, errno, "mkstemp %s failed", + full_fname(fnametmp)); + receive_data(f_in,mapbuf,-1,NULL,file->length); + if (mapbuf) + unmap_file(mapbuf); + if (fd1 != -1) + close(fd1); continue; } - - cleanup_set(fnametmp, fname, file, buf, fd1, fd2); - if (!am_server) { - log_transfer(file, fname); - } + cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2); + + if (!am_server && verbose) + rprintf(FINFO, "%s\n", fname); /* recv file data */ - recv_ok = receive_data(f_in,buf,fd2,fname,file->length); + recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length); log_recv(file, &initial_stats); - - if (buf) unmap_file(buf); - if (fd1 != -1) { + + if (mapbuf) + unmap_file(mapbuf); + if (fd1 != -1) close(fd1); + if (close(fd2) < 0) { + rsyserr(FERROR, errno, "close failed on %s", + full_fname(fnametmp)); + exit_cleanup(RERR_FILEIO); } - close(fd2); - - if (verbose > 2) - rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname); - finish_transfer(fname, fnametmp, file); + if (recv_ok || keep_partial) + finish_transfer(fname, fnametmp, file, recv_ok); + else + do_unlink(fnametmp); cleanup_disable(); if (!recv_ok) { if (csum_length == SUM_LENGTH) { rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n", - fname); + full_fname(fname)); } else { + char buf[4]; if (verbose > 1) rprintf(FINFO,"redoing %s(%d)\n",fname,i); - write_int(f_gen,i); + SIVAL(buf, 0, i); + send_msg(MSG_REDO, buf, 4); } } } + make_backups = save_make_backups; - if (delete_after) { - if (recurse && delete_mode && !local_name && flist->count>0) { - delete_files(flist); - } - } - - if (preserve_hard_links) - do_hard_links(); - - /* now we need to fix any directory permissions that were - modified during the transfer */ - for (i = 0; i < flist->count; i++) { - file = flist->files[i]; - if (!file->basename || !S_ISDIR(file->mode)) continue; - recv_generator(local_name?local_name:f_name(file),flist,i,-1); - } + if (delete_after && recurse && delete_mode && !local_name + && flist->count > 0) + delete_files(flist); if (verbose > 2) rprintf(FINFO,"recv_files finished\n"); - + return 0; } -