X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d62bcc17f303f30d1e3df1051b1390202a21cf9c..2c713fcdfa04eb7d58c67a4a51d4cbdc37f78536:/receiver.c diff --git a/receiver.c b/receiver.c index c7cde828..ac8f26bb 100644 --- a/receiver.c +++ b/receiver.c @@ -30,6 +30,7 @@ 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; @@ -46,6 +47,7 @@ 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) { @@ -53,19 +55,21 @@ static void delete_one(char *fn, int is_dir) if (robust_unlink(fn) != 0) { rsyserr(FERROR, errno, "delete_one: unlink %s failed", full_fname(fn)); - } else if (verbose) { + } else if (verbose) rprintf(FINFO, "deleting %s\n", fn); - } } else { if (do_rmdir(fn) != 0) { + if (errno == ENOTDIR && keep_dirlinks) { + delete_one(fn, 0); + return; + } if (errno != ENOTEMPTY && errno != EEXIST) { rsyserr(FERROR, errno, "delete_one: rmdir %s failed", full_fname(fn)); } - } else if (verbose) { + } else if (verbose) rprintf(FINFO, "deleting directory %s\n", fn); - } } } @@ -115,7 +119,7 @@ void delete_files(struct file_list *flist) if (flist_find(flist,local_file_list->files[i]) < 0) { char *f = f_name(local_file_list->files[i]); if (make_backups && (backup_dir || !is_backup_file(f))) { - (void) make_backup(f); + make_backup(f); if (verbose) rprintf(FINFO, "deleting %s\n", f); } else { @@ -202,11 +206,11 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, char *data; static char file_sum1[MD4_SUM_LENGTH]; static char file_sum2[MD4_SUM_LENGTH]; - char *map=NULL; + char *map = NULL; read_sum_head(f_in, &sum); - sum_init(); + sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) @@ -235,7 +239,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, i = -(i+1); offset2 = i*(OFF_T)sum.blength; len = sum.blength; - if (i == (int) sum.count-1 && sum.remainder != 0) + if (i == (int)sum.count-1 && sum.remainder != 0) len = sum.remainder; stats.matched_data += len; @@ -251,7 +255,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, sum_update(map,len); } - if (fd != -1 && write_file(fd,map,len) != (int) len) { + if (fd != -1 && write_file(fd, map, len) != (int)len) { rsyserr(FERROR, errno, "write failed on %s", full_fname(fname)); exit_cleanup(RERR_FILEIO); @@ -273,12 +277,10 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, sum_end(file_sum1); read_buf(f_in,file_sum2,MD4_SUM_LENGTH); - if (verbose > 2) { + if (verbose > 2) rprintf(FINFO,"got file_sum\n"); - } - if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) { + if (fd != -1 && memcmp(file_sum1, file_sum2, MD4_SUM_LENGTH) != 0) return 0; - } return 1; } @@ -287,7 +289,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, * 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 recv_files(int f_in, struct file_list *flist, char *local_name) { int fd1,fd2; STRUCT_STAT st; @@ -297,15 +299,13 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) char *fnamecmp; char fnamecmpbuf[MAXPATHLEN]; struct map_struct *mapbuf; - int i; struct file_struct *file; - int phase=0; - int recv_ok; 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); @@ -317,15 +317,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) i = read_int(f_in); if (i == -1) { - if (phase == 0) { - phase++; - csum_length = SUM_LENGTH; - if (verbose > 2) - rprintf(FINFO,"recv_files phase=%d\n",phase); - send_msg(MSG_DONE, "", 0); - 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) { @@ -347,9 +348,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) fname = f_name_to(file, fbuf); if (dry_run) { - if (!am_server && verbose) { /* log transfer */ + if (!am_server && verbose) rprintf(FINFO, "%s\n", fname); - } continue; } @@ -407,14 +407,18 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) if (fd1 != -1 && st.st_size > 0) { mapbuf = map_file(fd1,st.st_size); - if (verbose > 2) - rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)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 (mapbuf) unmap_file(mapbuf); - if (fd1 != -1) close(fd1); + if (mapbuf) + unmap_file(mapbuf); + if (fd1 != -1) + close(fd1); continue; } @@ -440,35 +444,33 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) 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); + if (mapbuf) + unmap_file(mapbuf); + if (fd1 != -1) + close(fd1); continue; } cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2); - if (!am_server && verbose) { /* log transfer */ + if (!am_server && verbose) rprintf(FINFO, "%s\n", fname); - } /* recv file data */ recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length); log_recv(file, &initial_stats); - if (mapbuf) unmap_file(mapbuf); - 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); } - if (verbose > 2) - rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname); - if (recv_ok || keep_partial) finish_transfer(fname, fnametmp, file, recv_ok); else @@ -489,6 +491,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) } } } + make_backups = save_make_backups; if (delete_after && recurse && delete_mode && !local_name && flist->count > 0)