X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/925c517f198deb41dc68589e97a50d15617c2a07..71020fc3aafc1cea58188b261b0f9f5b0c29b5f8:/receiver.c diff --git a/receiver.c b/receiver.c index 1ab74f5d..da89819a 100644 --- a/receiver.c +++ b/receiver.c @@ -23,7 +23,6 @@ extern int verbose; extern int recurse; extern int delete_mode; -extern int protocol_version; extern int csum_length; extern struct stats stats; extern int dry_run; @@ -41,49 +40,6 @@ extern char *backup_suffix; extern int backup_suffix_len; extern int cleanup_got_literal; -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) -{ - int i; - STRUCT_STAT st; - - if (link_stat(f_name(flist->files[j]), &st)) return 1; - - for (i = 0; i < dlist_len; i++) { - if (st.st_ino == delete_list[i].inode && - (DEV64_T)st.st_dev == delete_list[i].dev) - return 1; - } - - return 0; -} - -static void add_delete_entry(struct file_struct *file) -{ - if (dlist_len == dlist_alloc_len) { - dlist_alloc_len += 1024; - delete_list = realloc_array(delete_list, struct delete_list, - dlist_alloc_len); - if (!delete_list) out_of_memory("add_delete_entry"); - } - - delete_list[dlist_len].dev = file->dev; - 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(char *fn, int is_dir) { if (!is_dir) { @@ -120,7 +76,7 @@ void delete_files(struct file_list *flist) { struct file_list *local_file_list; int i, j; - char *name, fbuf[MAXPATHLEN]; + char *argv[1], fbuf[MAXPATHLEN]; extern int module_id; extern int ignore_errors; extern int max_delete; @@ -135,26 +91,21 @@ void delete_files(struct file_list *flist) } for (j = 0;j < flist->count; j++) { - if (!S_ISDIR(flist->files[j]->mode) || - !(flist->files[j]->flags & FLAG_DELETE)) continue; - - if (protocol_version < 19 && - delete_already_done(flist, j)) continue; + if (!(flist->files[j]->flags & FLAG_TOP_DIR) + || !S_ISDIR(flist->files[j]->mode)) + continue; - name = f_name_to(flist->files[j], fbuf, sizeof fbuf); + argv[0] = f_name_to(flist->files[j], fbuf); - if (!(local_file_list = send_file_list(-1,1,&name))) + if (!(local_file_list = send_file_list(-1, 1, argv))) continue; if (verbose > 1) - rprintf(FINFO,"deleting in %s\n", name); + 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 (protocol_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])) { char *f = f_name(local_file_list->files[i]); if (make_backups && (backup_dir || !is_backup_file(f))) { @@ -201,8 +152,8 @@ static int get_tmpname(char *fnametmp, char *fname) int maxname; if (tmpdir) { - strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2); - length = strlen(fnametmp); + /* 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 */ } @@ -251,7 +202,7 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, sum_init(); - for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) { + while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) show_progress(offset, total_size); @@ -330,7 +281,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 f_gen) +int recv_files(int f_in,struct file_list *flist,char *local_name) { int fd1,fd2; STRUCT_STAT st; @@ -359,12 +310,12 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) i = read_int(f_in); if (i == -1) { - if (phase==0) { + if (phase == 0) { phase++; csum_length = SUM_LENGTH; if (verbose > 2) rprintf(FINFO,"recv_files phase=%d\n",phase); - write_int(f_gen,-1); + send_msg(MSG_DONE, "", 0); continue; } break; @@ -378,6 +329,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) file = flist->files[i]; + stats.current_file_index = i; stats.num_transferred_files++; stats.total_transferred_size += file->length; cleanup_got_literal = 0; @@ -385,7 +337,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) if (local_name) fname = local_name; else - fname = f_name_to(file, fbuf, sizeof fbuf); + fname = f_name_to(file, fbuf); if (dry_run) { if (!am_server && verbose) { /* log transfer */ @@ -406,8 +358,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) 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); } @@ -459,7 +411,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) 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 @@ -474,7 +426,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) * 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)); + strlcpy(fnametmp, template, sizeof fnametmp); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); } if (fd2 == -1) { @@ -515,30 +467,18 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n", 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); } } } - 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_to(file,fbuf,sizeof fbuf), 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");