X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/85909931857090541511e7ab9a085225e0db0407..16edf86595a5a990a942fa045dfb523dae1fe6cb:/receiver.c diff --git a/receiver.c b/receiver.c index 07fe3f4d..21528a7c 100644 --- a/receiver.c +++ b/receiver.c @@ -3,12 +3,11 @@ * * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2007 Wayne Davison * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,9 +22,11 @@ #include "rsync.h" extern int verbose; +extern int dry_run; extern int do_xfers; extern int am_server; extern int do_progress; +extern int inc_recurse; extern int log_before_transfer; extern int stdout_format_has_i; extern int logfile_format_has_i; @@ -37,27 +38,29 @@ extern int protocol_version; extern int relative_paths; extern int preserve_hard_links; extern int preserve_perms; +extern int preserve_xattrs; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; -extern int remove_sent_files; +extern int remove_source_files; extern int append_mode; extern int sparse_files; extern int keep_partial; extern int checksum_seed; extern int inplace; extern int delay_updates; +extern mode_t orig_umask; extern struct stats stats; -extern char *stdout_format; extern char *tmpdir; extern char *partial_dir; extern char *basis_dir[]; -extern struct file_list *the_file_list; +extern struct file_list *cur_flist, *first_flist; extern struct filter_list_struct server_filter_list; static struct bitbag *delayed_bits = NULL; -static int phase = 0; - +static int phase = 0, redoing = 0; +/* We're either updating the basis file or an identical copy: */ +static int updating_basis; /* * get_tmpname() - create a tmp filename for a given filename @@ -80,17 +83,15 @@ static int phase = 0; * As long as it's unique, rsync will work. */ -static int get_tmpname(char *fnametmp, char *fname) +int get_tmpname(char *fnametmp, char *fname) { + int maxname, added, length = 0; char *f; - int length = 0; - int maxname; if (tmpdir) { /* 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) { @@ -103,8 +104,9 @@ static int get_tmpname(char *fnametmp, char *fname) } else f = fname; fnametmp[length++] = '.'; - fnametmp[length] = '\0'; /* always NULL terminated */ + /* The maxname value is bufsize, and includes space for the '\0'. + * (Note that NAME_MAX get -8 for the leading '.' above.) */ maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8); if (maxname < 1) { @@ -113,21 +115,23 @@ static int get_tmpname(char *fnametmp, char *fname) return 0; } - strlcpy(fnametmp + length, f, maxname); - strcat(fnametmp + length, ".XXXXXX"); + added = strlcpy(fnametmp + length, f, maxname); + if (added >= maxname) + added = maxname - 1; + memcpy(fnametmp + length + added, ".XXXXXX", 8); return 1; } static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, - char *fname, int fd, OFF_T total_size) + const char *fname, int fd, OFF_T total_size) { - static char file_sum1[MD4_SUM_LENGTH]; - static char file_sum2[MD4_SUM_LENGTH]; + static char file_sum1[MAX_DIGEST_LEN]; + static char file_sum2[MAX_DIGEST_LEN]; struct map_struct *mapbuf; struct sum_struct sum; - int32 len; + int32 len, sum_len; OFF_T offset = 0; OFF_T offset2; char *data; @@ -148,7 +152,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, sum_init(checksum_seed); - if (append_mode) { + if (append_mode > 0) { OFF_T j; sum.flength = (OFF_T)sum.count * sum.blength; if (sum.remainder) @@ -161,7 +165,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, offset = j; } if (offset < sum.flength) { - int32 len = sum.flength - offset; + int32 len = (int32)(sum.flength - offset); if (do_progress) show_progress(offset, total_size); sum_update(map_ptr(mapbuf, offset, len), len); @@ -216,7 +220,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, sum_update(map, len); } - if (inplace) { + if (updating_basis) { if (offset == offset2 && fd != -1) { OFF_T pos; if (flush_write_file(fd) < 0) @@ -255,15 +259,15 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, exit_cleanup(RERR_FILEIO); } - sum_end(file_sum1); + sum_len = sum_end(file_sum1); if (mapbuf) unmap_file(mapbuf); - read_buf(f_in,file_sum2,MD4_SUM_LENGTH); + read_buf(f_in, file_sum2, sum_len); 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, sum_len) != 0) return 0; return 1; } @@ -274,16 +278,16 @@ static void discard_receive_data(int f_in, OFF_T length) receive_data(f_in, NULL, -1, 0, NULL, -1, length); } -static void handle_delayed_updates(struct file_list *flist, char *local_name) +static void handle_delayed_updates(char *local_name) { - char *fname, *partialptr, numbuf[4]; - int i; + char *fname, *partialptr; + int ndx; - for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) { - struct file_struct *file = flist->files[i]; + for (ndx = -1; (ndx = bitbag_next_bit(delayed_bits, ndx)) >= 0; ) { + struct file_struct *file = cur_flist->files[ndx]; fname = local_name ? local_name : f_name(file, NULL); if ((partialptr = partial_dir_fname(fname)) != NULL) { - if (make_backups && !make_backup(fname)) + if (make_backups > 0 && !make_backup(fname)) continue; if (verbose > 2) { rprintf(FINFO, "renaming %s to %s\n", @@ -296,110 +300,116 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name) "rename failed for %s (from %s)", full_fname(fname), partialptr); } else { - if (remove_sent_files - || (preserve_hard_links - && file->link_u.links)) { - SIVAL(numbuf, 0, i); - send_msg(MSG_SUCCESS,numbuf,4); - } + if (remove_source_files + || (preserve_hard_links && F_IS_HLINKED(file))) + send_msg_int(MSG_SUCCESS, ndx); handle_partial_dir(partialptr, PDIR_DELETE); } } } } -static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i) +static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx) { - while (next_gen_i < desired_i) { - if (next_gen_i >= 0) { + while (next_gen_ndx < desired_ndx) { + if (next_gen_ndx >= 0) { rprintf(FINFO, "(No batched update for%s \"%s\")\n", - phase ? " resend of" : "", - f_name(the_file_list->files[next_gen_i], NULL)); + redoing ? " resend of" : "", + f_name(cur_flist->files[next_gen_ndx], NULL)); + } + next_gen_ndx = read_int(fd); + if (next_gen_ndx == -1) { + if (inc_recurse) + next_gen_ndx = first_flist->prev->count + first_flist->prev->ndx_start; + else + next_gen_ndx = cur_flist->count; } - next_gen_i = read_int(batch_gen_fd); - if (next_gen_i == -1) - next_gen_i = the_file_list->count; } - return next_gen_i; + return next_gen_ndx; } - /** * 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, char *local_name) { - int next_gen_i = -1; + int next_gen_ndx = -1; int fd1,fd2; STRUCT_STAT st; int iflags, xlen; char *fname, fbuf[MAXPATHLEN]; char xname[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; - char *fnamecmp, *partialptr, numbuf[4]; + char *fnamecmp, *partialptr; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; struct file_struct *file; struct stats initial_stats; - int save_make_backups = make_backups; int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i; enum logcode log_code = log_before_transfer ? FLOG : FINFO; int max_phase = protocol_version >= 29 ? 2 : 1; - int i, recv_ok; + int dflt_perms = (ACCESSPERMS & ~orig_umask); +#ifdef SUPPORT_ACLS + const char *parent_dirname = ""; +#endif + int ndx, recv_ok; 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; - } + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count); if (delay_updates) - delayed_bits = bitbag_create(flist->count); + delayed_bits = bitbag_create(cur_flist->count + 1); + + updating_basis = inplace; while (1) { cleanup_disable(); - i = read_int(f_in); - if (i == -1) { - if (read_batch) { - get_next_gen_i(batch_gen_fd, next_gen_i, - flist->count); - next_gen_i = -1; + /* This call also sets cur_flist. */ + ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, + xname, &xlen); + if (ndx == NDX_DONE) { + if (inc_recurse && first_flist) { + flist_free(first_flist); + if (first_flist) + continue; + } + if (read_batch && cur_flist) { + int high = inc_recurse + ? first_flist->prev->count + first_flist->prev->ndx_start + : cur_flist->count; + get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high); + next_gen_ndx = -1; } if (++phase > max_phase) break; - csum_length = SUM_LENGTH; if (verbose > 2) rprintf(FINFO, "recv_files phase=%d\n", phase); if (phase == 2 && delay_updates) - handle_delayed_updates(flist, local_name); + handle_delayed_updates(local_name); send_msg(MSG_DONE, "", 0); - if (keep_partial && !partial_dir) - make_backups = 0; /* prevents double backup */ - if (append_mode) { - append_mode = 0; - sparse_files = 0; - } continue; } - iflags = read_item_attrs(f_in, -1, i, &fnamecmp_type, - xname, &xlen); - if (iflags == ITEM_IS_NEW) /* no-op packet */ - continue; - - file = flist->files[i]; + file = cur_flist->files[ndx - cur_flist->ndx_start]; fname = local_name ? local_name : f_name(file, fbuf); if (verbose > 2) rprintf(FINFO, "recv_files(%s)\n", fname); +#ifdef SUPPORT_XATTRS + if (iflags & ITEM_REPORT_XATTR && !dry_run) + recv_xattr_request(file, f_in); +#endif + if (!(iflags & ITEM_TRANSFER)) { maybe_log_item(file, iflags, itemizing, xname); +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + set_file_attrs(fname, file, NULL, fname, 0); +#endif continue; } if (phase == 2) { @@ -409,9 +419,29 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) exit_cleanup(RERR_PROTOCOL); } - stats.current_file_index = i; + if (file->flags & FLAG_FILE_SENT) { + if (csum_length == SHORT_SUM_LENGTH) { + if (keep_partial && !partial_dir) + make_backups = -make_backups; /* prevents double backup */ + append_mode = -append_mode; + sparse_files = -sparse_files; + csum_length = SUM_LENGTH; + redoing = 1; + } + } else { + if (csum_length != SHORT_SUM_LENGTH) { + if (keep_partial && !partial_dir) + make_backups = -make_backups; + append_mode = -append_mode; + sparse_files = -sparse_files; + csum_length = SHORT_SUM_LENGTH; + redoing = 0; + } + } + + stats.current_file_index = ndx; stats.num_transferred_files++; - stats.total_transferred_size += file->length; + stats.total_transferred_size += F_LENGTH(file); cleanup_got_literal = 0; if (server_filter_list.head @@ -423,26 +453,26 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) if (!do_xfers) { /* log the transfer */ log_item(FCLIENT, file, &stats, iflags, NULL); if (read_batch) - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); continue; } if (write_batch < 0) { log_item(FINFO, file, &stats, iflags, NULL); if (!am_server) - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); continue; } if (read_batch) { - next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i); - if (i < next_gen_i) { + next_gen_ndx = get_next_gen_ndx(batch_gen_fd, next_gen_ndx, ndx); + if (ndx < next_gen_ndx) { rprintf(FINFO, "(Skipping batched update for \"%s\")\n", fname); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); continue; } - next_gen_i = -1; + next_gen_ndx = -1; } partialptr = partial_dir ? partial_dir_fname(fname) : fname; @@ -459,6 +489,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) fnamecmp = get_backup_name(fname); break; case FNAMECMP_FUZZY: + updating_basis = 0; if (file->dirname) { pathjoin(fnamecmpbuf, MAXPATHLEN, file->dirname, xname); @@ -467,6 +498,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) fnamecmp = xname; break; default: + updating_basis = 0; if (fnamecmp_type >= basis_dir_cnt) { rprintf(FERROR, "invalid basis_dir index: %d.\n", @@ -484,7 +516,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } else { /* Reminder: --inplace && --partial-dir are never * enabled at the same time. */ - if (inplace && make_backups) { + if (inplace && make_backups > 0) { if (!(fnamecmp = get_backup_name(fname))) fnamecmp = fname; } else if (partial_dir && partialptr) @@ -513,10 +545,13 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } } - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { + if (fd1 == -1) { + st.st_mode = 0; + st.st_size = 0; + } else if (do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; } @@ -529,7 +564,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) */ rprintf(FERROR,"recv_files: %s is a directory\n", full_fname(fnamecmp)); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; } @@ -543,23 +578,32 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) * mode based on the local permissions and some heuristics. */ if (!preserve_perms) { int exists = fd1 != -1; - file->mode = dest_mode(file->mode, st.st_mode, exists); +#ifdef SUPPORT_ACLS + const char *dn = file->dirname ? file->dirname : "."; + if (parent_dirname != dn + && strcmp(parent_dirname, dn) != 0) { + dflt_perms = default_perms_for_dir(dn); + parent_dirname = dn; + } +#endif + file->mode = dest_mode(file->mode, st.st_mode, + dflt_perms, exists); } - /* We now check to see if we are writing file "inplace" */ + /* We now check to see if we are writing the file "inplace" */ if (inplace) { fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600); if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); continue; } } else { if (!get_tmpname(fnametmp,fname)) { - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); continue; @@ -585,7 +629,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); continue; @@ -602,7 +646,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); + fname, fd2, F_LENGTH(file)); log_item(log_code, file, &initial_stats, iflags, NULL); @@ -622,18 +666,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) temp_copy_name = NULL; else temp_copy_name = partialptr; - finish_transfer(fname, fnametmp, temp_copy_name, - file, recv_ok, 1); + finish_transfer(fname, fnametmp, fnamecmp, + temp_copy_name, file, recv_ok, 1); if (fnamecmp == partialptr) { do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } } else if (keep_partial && partialptr && handle_partial_dir(partialptr, PDIR_CREATE)) { - finish_transfer(partialptr, fnametmp, NULL, + finish_transfer(partialptr, fnametmp, fnamecmp, NULL, file, recv_ok, !partial_dir); if (delay_updates && recv_ok) { - bitbag_set_bit(delayed_bits, i); + bitbag_set_bit(delayed_bits, ndx); recv_ok = -1; } } else { @@ -644,13 +688,11 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) cleanup_disable(); if (recv_ok > 0) { - if (remove_sent_files - || (preserve_hard_links && file->link_u.links)) { - SIVAL(numbuf, 0, i); - send_msg(MSG_SUCCESS, numbuf, 4); - } + if (remove_source_files || inc_recurse + || (preserve_hard_links && F_IS_HLINKED(file))) + send_msg_int(MSG_SUCCESS, ndx); } else if (!recv_ok) { - int msgtype = phase || read_batch ? FERROR : FINFO; + enum logcode msgtype = redoing || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { char *errstr, *redostr, *keptstr; if (!(keep_partial && partialptr) && !inplace) @@ -670,16 +712,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) "%s: %s failed verification -- update %s%s.\n", errstr, fname, keptstr, redostr); } - if (!phase) { - SIVAL(numbuf, 0, i); - send_msg(MSG_REDO, numbuf, 4); - } + if (!redoing) { + send_msg_int(MSG_REDO, ndx); + file->flags |= FLAG_FILE_SENT; + } else if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); } } - make_backups = save_make_backups; + if (make_backups < 0) + make_backups = -make_backups; if (phase == 2 && delay_updates) /* for protocol_version < 29 */ - handle_delayed_updates(flist, local_name); + handle_delayed_updates(local_name); if (verbose > 2) rprintf(FINFO,"recv_files finished\n");