X-Git-Url: http://git.samba.org/samba.git/?p=rsync.git;a=blobdiff_plain;f=receiver.c;h=39c5e490dc96f80c9e2b139957b1881b39157027;hp=a9a9cd2a961c9f343aeaed4c86751727ca2f2401;hb=bdc038fce0ae9f0cb83b579608e3a244703f8cc7;hpb=71903f601a37392eb8ecb737c10fac78d18f5777 diff --git a/receiver.c b/receiver.c index a9a9cd2a..39c5e490 100644 --- a/receiver.c +++ b/receiver.c @@ -1,78 +1,67 @@ -/* -*- 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. -*/ +/* + * Routines only used by the receiving process. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003-2009 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 3 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, visit the http://fsf.org website. + */ #include "rsync.h" extern int verbose; -extern int delete_after; -extern int csum_length; -extern struct stats stats; 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; +extern int csum_length; extern int read_batch; +extern int write_batch; extern int batch_gen_fd; -extern int am_server; extern int protocol_version; extern int relative_paths; -extern int keep_dirlinks; extern int preserve_hard_links; extern int preserve_perms; -extern int io_error; -extern char *tmpdir; -extern char *partial_dir; -extern char *basis_dir[]; +extern int preserve_xattrs; extern int basis_dir_cnt; extern int make_backups; -extern int do_progress; extern int cleanup_got_literal; -extern int module_id; -extern int ignore_errors; -extern int orig_umask; +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 *tmpdir; +extern char *partial_dir; +extern char *basis_dir[]; +extern struct file_list *cur_flist, *first_flist, *dir_flist; +extern struct filter_list_struct daemon_filter_list; -extern struct filter_list_struct server_filter_list; - - -/* This deletes any files on the receiving side that are not present on the - * sending side. This is used by --delete-before and --delete-after. */ -void delete_files(struct file_list *flist) -{ - char fbuf[MAXPATHLEN]; - int j; - - for (j = 0; j < flist->count; j++) { - struct file_struct *file = flist->files[j]; - - if (!(file->flags & FLAG_DEL_HERE)) - continue; - - f_name_to(file, fbuf); - if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); - - delete_in_dir(flist, fbuf, file); - } -} - +static struct bitbag *delayed_bits = NULL; +static int phase = 0, redoing = 0; +static flist_ndx_list batch_redo_list; +/* We're either updating the basis file or an identical copy: */ +static int updating_basis_or_equiv; /* * get_tmpname() - create a tmp filename for a given filename @@ -95,17 +84,15 @@ void delete_files(struct file_list *flist) * As long as it's unique, rsync will work. */ -static int get_tmpname(char *fnametmp, char *fname) +int get_tmpname(char *fnametmp, const char *fname) { - char *f; - int length = 0; - int maxname; + int maxname, added, length = 0; + const char *f; 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) { @@ -118,32 +105,71 @@ 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) { - rprintf(FERROR, "temporary filename too long: %s\n", - safe_fname(fname)); + rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname); fnametmp[0] = '\0'; 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; } +/* Opens a temporary file for writing. + * Success: Writes name into fnametmp, returns fd. + * Failure: Clobbers fnametmp, returns -1. + * Calling cleanup_set() is the caller's job. */ +int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file) +{ + int fd; + + if (!get_tmpname(fnametmp, fname)) + return -1; + + /* We initially set the perms without the setuid/setgid bits or group + * access to ensure that there is no race condition. They will be + * correctly updated after the right owner and group info is set. + * (Thanks to snabb@epipe.fi for pointing this out.) */ + fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); + +#if 0 + /* 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 (fd == -1 && relative_paths && errno == ENOENT + && create_directory_path(fnametmp) == 0) { + /* Get back to name with XXXXXX in it. */ + get_tmpname(fnametmp, fname); + fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); + } +#endif + + if (fd == -1) { + rsyserr(FERROR_XFER, errno, "mkstemp %s failed", + full_fname(fnametmp)); + return -1; + } + + return fd; +} 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; @@ -157,13 +183,41 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, mapbuf = map_file(fd_r, size_r, read_size, sum.blength); if (verbose > 2) { rprintf(FINFO, "recv mapped %s of size %.0f\n", - safe_fname(fname_r), (double)size_r); + fname_r, (double)size_r); } } else mapbuf = NULL; sum_init(checksum_seed); + if (append_mode > 0) { + OFF_T j; + sum.flength = (OFF_T)sum.count * sum.blength; + if (sum.remainder) + sum.flength -= sum.blength - sum.remainder; + if (append_mode == 2) { + for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) { + if (do_progress) + show_progress(offset, total_size); + sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), + CHUNK_SIZE); + offset = j; + } + if (offset < sum.flength) { + int32 len = (int32)(sum.flength - offset); + if (do_progress) + show_progress(offset, total_size); + sum_update(map_ptr(mapbuf, offset, len), len); + } + } + offset = sum.flength; + if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) { + rsyserr(FERROR_XFER, errno, "lseek of %s returned %.0f, not %.0f", + full_fname(fname), (double)j, (double)offset); + exit_cleanup(RERR_FILEIO); + } + } + while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) show_progress(offset, total_size); @@ -206,21 +260,23 @@ 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_or_equiv) { if (offset == offset2 && fd != -1) { + OFF_T pos; if (flush_write_file(fd) < 0) goto report_write_error; offset += len; - if (do_lseek(fd, len, SEEK_CUR) != offset) { - rsyserr(FERROR, errno, - "lseek failed on %s", - full_fname(fname)); + if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) { + rsyserr(FERROR_XFER, errno, + "lseek of %s returned %.0f, not %.0f", + full_fname(fname), + (double)pos, (double)offset); exit_cleanup(RERR_FILEIO); } continue; } } - if (fd != -1 && write_file(fd, map, len) != (int)len) + if (fd != -1 && map && write_file(fd, map, len) != (int)len) goto report_write_error; offset += len; } @@ -228,9 +284,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, if (flush_write_file(fd) < 0) goto report_write_error; -#if HAVE_FTRUNCATE - if (inplace && fd != -1) - ftruncate(fd, offset); +#ifdef HAVE_FTRUNCATE + if (inplace && fd != -1 + && ftruncate(fd, offset) < 0) { + rsyserr(FERROR_XFER, errno, "ftruncate failed on %s", + full_fname(fname)); + } #endif if (do_progress) @@ -238,20 +297,20 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { report_write_error: - rsyserr(FERROR, errno, "write failed on %s", + rsyserr(FERROR_XFER, errno, "write failed on %s", full_fname(fname)); 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; } @@ -262,163 +321,335 @@ 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(char *local_name) +{ + char *fname, *partialptr; + int ndx; + + 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 > 0 && !make_backup(fname)) + continue; + if (verbose > 2) { + rprintf(FINFO, "renaming %s to %s\n", + partialptr, fname); + } + /* We don't use robust_rename() here because the + * partial-dir must be on the same drive. */ + if (do_rename(partialptr, fname) < 0) { + rsyserr(FERROR_XFER, errno, + "rename failed for %s (from %s)", + full_fname(fname), partialptr); + } else { + if (remove_source_files + || (preserve_hard_links && F_IS_HLINKED(file))) + send_msg_int(MSG_SUCCESS, ndx); + handle_partial_dir(partialptr, PDIR_DELETE); + } + } + } +} + +static void no_batched_update(int ndx, BOOL is_redo) +{ + struct file_list *flist = flist_for_ndx(ndx, "no_batched_update"); + struct file_struct *file = flist->files[ndx - flist->ndx_start]; + + rprintf(FERROR_XFER, "(No batched update for%s \"%s\")\n", + is_redo ? " resend of" : "", f_name(file, NULL)); + + if (inc_recurse && !dry_run) + send_msg_int(MSG_NO_SEND, ndx); +} + +static int we_want_redo(int desired_ndx) +{ + static int redo_ndx = -1; + + while (redo_ndx < desired_ndx) { + if (redo_ndx >= 0) + no_batched_update(redo_ndx, True); + if ((redo_ndx = flist_ndx_pop(&batch_redo_list)) < 0) + return 0; + } + + if (redo_ndx == desired_ndx) { + redo_ndx = -1; + return 1; + } + + return 0; +} + +static int gen_wants_ndx(int desired_ndx) +{ + static int next_ndx = -1; + static int done_cnt = 0; + static BOOL got_eof = False; + int flist_num = first_flist->flist_num; + + if (got_eof) + return 0; + + while (next_ndx < desired_ndx) { + if (inc_recurse && flist_num <= done_cnt) + return 0; + if (next_ndx >= 0) + no_batched_update(next_ndx, False); + if ((next_ndx = read_int(batch_gen_fd)) < 0) { + if (inc_recurse) { + done_cnt++; + continue; + } + got_eof = True; + return 0; + } + } + + if (next_ndx == desired_ndx) { + next_ndx = -1; + return 1; + } + + return 0; +} /** * 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_in_name) +int recv_files(int f_in, char *local_name) { - int next_gen_i = -1; int fd1,fd2; STRUCT_STAT st; + int iflags, xlen; char *fname, fbuf[MAXPATHLEN]; - char template[MAXPATHLEN]; + char xname[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; char *fnamecmp, *partialptr; char fnamecmpbuf[MAXPATHLEN]; - uchar *delayed_bits = NULL; + uchar fnamecmp_type; struct file_struct *file; struct stats initial_stats; - int save_make_backups = make_backups; - int i, recv_ok, phase = 0; + 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 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); + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used); - if (flist->hlink_pool) { - pool_destroy(flist->hlink_pool); - flist->hlink_pool = NULL; - } - - if (delay_updates) { - int sz = (flist->count + 7) / 8; - if (!(delayed_bits = new_array(uchar, sz))) - out_of_memory("recv_files"); - memset(delayed_bits, 0, sz); - } + if (delay_updates) + delayed_bits = bitbag_create(cur_flist->used + 1); while (1) { cleanup_disable(); - i = read_int(f_in); - if (i == -1) { - if (read_batch) { - if (next_gen_i != flist->count) { - do { - if (f_in_name >= 0 - && next_gen_i >= 0) - read_byte(f_in_name); - } while (read_int(batch_gen_fd) != -1); - } - next_gen_i = -1; - } - - if (phase) + /* 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) { + if (read_batch) + gen_wants_ndx(first_flist->used + first_flist->ndx_start); + flist_free(first_flist); + if (first_flist) + continue; + } else if (read_batch && first_flist) + gen_wants_ndx(first_flist->used); + if (++phase > max_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 && !partial_dir) - make_backups = 0; /* prevents double backup */ + if (phase == 2 && delay_updates) + handle_delayed_updates(local_name); + send_msg(MSG_DONE, "", 0, 0); continue; } - if (i < 0 || i >= flist->count) { - rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", - i, flist->count); + if (ndx - cur_flist->ndx_start >= 0) + file = cur_flist->files[ndx - cur_flist->ndx_start]; + else + file = dir_flist->files[cur_flist->parent_ndx]; + 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 && do_xfers) + 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 && do_xfers) + set_file_attrs(fname, file, NULL, fname, 0); +#endif + continue; + } + if (phase == 2) { + rprintf(FERROR, + "got transfer request in phase 2 [%s]\n", + who_am_i()); exit_cleanup(RERR_PROTOCOL); } - file = flist->files[i]; - if (S_ISDIR(file->mode)) { - rprintf(FERROR, "[%s] got index of directory: %d\n", - who_am_i(), i); - exit_cleanup(RERR_PROTOCOL); + if (file->flags & FLAG_FILE_SENT) { + if (csum_length == SHORT_SUM_LENGTH) { + if (keep_partial && !partial_dir) + make_backups = -make_backups; /* prevents double backup */ + if (append_mode) + sparse_files = -sparse_files; + append_mode = -append_mode; + csum_length = SUM_LENGTH; + redoing = 1; + } + } else { + if (csum_length != SHORT_SUM_LENGTH) { + if (keep_partial && !partial_dir) + make_backups = -make_backups; + if (append_mode) + sparse_files = -sparse_files; + append_mode = -append_mode; + csum_length = SHORT_SUM_LENGTH; + redoing = 0; + } } - stats.current_file_index = i; + if (!am_server && do_progress) + set_current_file_index(file, ndx); stats.num_transferred_files++; - stats.total_transferred_size += file->length; - cleanup_got_literal = 0; + stats.total_transferred_size += F_LENGTH(file); - fname = local_name ? local_name : f_name_to(file, fbuf); + cleanup_got_literal = 0; - if (server_filter_list.head - && check_filter(&server_filter_list, fname, 0) < 0) { + if (daemon_filter_list.head + && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); exit_cleanup(RERR_PROTOCOL); } - if (verbose > 2) - rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); - - if (dry_run) { - if (!am_server && verbose) /* log the transfer */ - rprintf(FINFO, "%s\n", safe_fname(fname)); - continue; - } - - initial_stats = stats; - if (read_batch) { - while (i > next_gen_i) { - if (f_in_name >= 0 && next_gen_i >= 0) - read_byte(f_in_name); - next_gen_i = read_int(batch_gen_fd); - if (next_gen_i == -1) - next_gen_i = flist->count; - } - if (i < next_gen_i) { - rprintf(FINFO, "skipping update for \"%s\"\n", - safe_fname(fname)); - discard_receive_data(f_in, file->length); + int wanted = redoing + ? we_want_redo(ndx) + : gen_wants_ndx(ndx); + if (!wanted) { + rprintf(FINFO, + "(Skipping batched update for%s \"%s\")\n", + redoing ? " resend of" : "", + fname); + discard_receive_data(f_in, F_LENGTH(file)); + file->flags |= FLAG_FILE_SENT; continue; } - next_gen_i = -1; + } + + if (!do_xfers) { /* log the transfer */ + log_item(FCLIENT, file, &stats, iflags, NULL); + if (read_batch) + discard_receive_data(f_in, F_LENGTH(file)); + continue; + } + if (write_batch < 0) { + log_item(FCLIENT, file, &stats, iflags, NULL); + if (!am_server) + discard_receive_data(f_in, F_LENGTH(file)); + continue; } partialptr = partial_dir ? partial_dir_fname(fname) : fname; - if (f_in_name >= 0) { - uchar j; - switch (j = read_byte(f_in_name)) { + if (protocol_version >= 29) { + switch (fnamecmp_type) { case FNAMECMP_FNAME: fnamecmp = fname; break; case FNAMECMP_PARTIAL_DIR: - fnamecmp = partialptr ? partialptr : fname; + fnamecmp = partialptr; break; case FNAMECMP_BACKUP: fnamecmp = get_backup_name(fname); break; + case FNAMECMP_FUZZY: + if (file->dirname) { + pathjoin(fnamecmpbuf, MAXPATHLEN, + file->dirname, xname); + fnamecmp = fnamecmpbuf; + } else + fnamecmp = xname; + break; default: - if (j >= basis_dir_cnt) { + if (fnamecmp_type >= basis_dir_cnt) { rprintf(FERROR, "invalid basis_dir index: %d.\n", - j); + fnamecmp_type); exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[j], fname); + basis_dir[fnamecmp_type], fname); fnamecmp = fnamecmpbuf; break; } - } else - fnamecmp = fname; + if (!fnamecmp || (daemon_filter_list.head + && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) { + fnamecmp = fname; + fnamecmp_type = FNAMECMP_FNAME; + } + } else { + /* Reminder: --inplace && --partial-dir are never + * enabled at the same time. */ + if (inplace && make_backups > 0) { + if (!(fnamecmp = get_backup_name(fname))) + fnamecmp = fname; + else + fnamecmp_type = FNAMECMP_BACKUP; + } else if (partial_dir && partialptr) + fnamecmp = partialptr; + else + fnamecmp = fname; + } + + initial_stats = stats; /* open the file */ fd1 = do_open(fnamecmp, O_RDONLY, 0); - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { - rsyserr(FERROR, errno, "fstat %s failed", + if (fd1 == -1 && protocol_version < 29) { + if (fnamecmp != fname) { + fnamecmp = fname; + fd1 = do_open(fnamecmp, O_RDONLY, 0); + } + + if (fd1 == -1 && basis_dir[0]) { + /* pre-29 allowed only one alternate basis */ + pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, + basis_dir[0], fname); + fnamecmp = fnamecmpbuf; + fd1 = do_open(fnamecmp, O_RDONLY, 0); + } + } + + updating_basis_or_equiv = inplace + && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP); + + if (fd1 == -1) { + st.st_mode = 0; + st.st_size = 0; + } else if (do_fstat(fd1,&st) != 0) { + rsyserr(FERROR_XFER, errno, "fstat %s failed", full_fname(fnamecmp)); - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); close(fd1); + if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); continue; } @@ -428,10 +659,12 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, * and the underlying robust_unlink could cope * with directories */ - rprintf(FERROR,"recv_files: %s is a directory\n", + rprintf(FERROR_XFER, "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); + if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); continue; } @@ -440,71 +673,55 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, fd1 = -1; } - if (fd1 != -1 && !preserve_perms) { - /* 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 we're not preserving permissions, change the file-list's + * mode based on the local permissions and some heuristics. */ + if (!preserve_perms) { + int exists = fd1 != -1; +#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, 0); + fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600); if (fd2 == -1) { - rsyserr(FERROR, errno, "open %s failed", + rsyserr(FERROR_XFER, errno, "open %s failed", full_fname(fname)); - discard_receive_data(f_in, file->length); - if (fd1 != -1) - close(fd1); - continue; } } else { - if (!get_tmpname(fnametmp,fname)) { - discard_receive_data(f_in, file->length); - if (fd1 != -1) - close(fd1); - continue; - } - - 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. */ - fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); - - /* 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, orig_umask) == 0) { - strlcpy(fnametmp, template, sizeof fnametmp); - fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); - } - if (fd2 == -1) { - rsyserr(FERROR, errno, "mkstemp %s failed", - full_fname(fnametmp)); - discard_receive_data(f_in, file->length); - if (fd1 != -1) - close(fd1); - continue; - } - - if (partialptr) + fd2 = open_tmpfile(fnametmp, fname, file); + if (fd2 != -1) cleanup_set(fnametmp, partialptr, file, fd1, fd2); } - if (!am_server && verbose) /* log the transfer */ - rprintf(FINFO, "%s\n", safe_fname(fname)); + if (fd2 == -1) { + discard_receive_data(f_in, F_LENGTH(file)); + if (fd1 != -1) + close(fd1); + if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); + continue; + } + + /* log the transfer */ + if (log_before_transfer) + log_item(FCLIENT, file, &initial_stats, iflags, NULL); + else if (!am_server && verbose && do_progress) + rprintf(FINFO, "%s\n", fname); /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); + fname, fd2, F_LENGTH(file)); - log_recv(file, &initial_stats); + log_item(log_code, file, &initial_stats, iflags, NULL); if (fd1 != -1) close(fd1); @@ -514,29 +731,51 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, exit_cleanup(RERR_FILEIO); } - if ((recv_ok && !delay_updates) || inplace) { - finish_transfer(fname, fnametmp, file, recv_ok, 1); - if (partialptr != fname && fnamecmp == partialptr) { + if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { + if (partialptr == fname) + partialptr = NULL; + if (!finish_transfer(fname, fnametmp, fnamecmp, + partialptr, file, recv_ok, 1)) + recv_ok = -1; + else 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, file, recv_ok, - !partial_dir); - if (delay_updates && recv_ok) - delayed_bits[i/8] |= 1 << (i % 8); - } else { - partialptr = NULL; + } else if (keep_partial && partialptr) { + if (!handle_partial_dir(partialptr, PDIR_CREATE)) { + rprintf(FERROR, + "Unable to create partial-dir for %s -- discarding %s.\n", + local_name ? local_name : f_name(file, NULL), + recv_ok ? "completed file" : "partial file"); + do_unlink(fnametmp); + recv_ok = -1; + } else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL, + file, recv_ok, !partial_dir)) + recv_ok = -1; + else if (delay_updates && recv_ok) { + bitbag_set_bit(delayed_bits, ndx); + recv_ok = 2; + } else + partialptr = NULL; + } else do_unlink(fnametmp); - } cleanup_disable(); - if (!recv_ok) { - int msgtype = csum_length == SUM_LENGTH || read_batch ? - FERROR : FINFO; - if (msgtype == FERROR || verbose) { + if (read_batch) + file->flags |= FLAG_FILE_SENT; + + switch (recv_ok) { + case 2: + break; + case 1: + if (remove_source_files || inc_recurse + || (preserve_hard_links && F_IS_HLINKED(file))) + send_msg_int(MSG_SUCCESS, ndx); + break; + case 0: { + enum logcode msgtype = redoing ? FERROR_XFER : FWARNING; + if (msgtype == FERROR_XFER || verbose) { char *errstr, *redostr, *keptstr; if (!(keep_partial && partialptr) && !inplace) keptstr = "discarded"; @@ -544,58 +783,39 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, keptstr = "put into partial-dir"; else keptstr = "retained"; - if (msgtype == FERROR) { + if (msgtype == FERROR_XFER) { errstr = "ERROR"; redostr = ""; } else { errstr = "WARNING"; - redostr = " (will try again)"; + redostr = read_batch ? " (may try again)" + : " (will try again)"; } rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", - errstr, safe_fname(fname), + errstr, local_name ? f_name(file, NULL) : fname, keptstr, redostr); } - if (csum_length != SUM_LENGTH) { - char buf[4]; - SIVAL(buf, 0, i); - send_msg(MSG_REDO, buf, 4); - } - } - } - make_backups = save_make_backups; - - if (delay_updates) { - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; - if (!file->basename - || !(delayed_bits[i/8] & (1 << (i % 8)))) - continue; - fname = local_name ? local_name : f_name(file); - partialptr = partial_dir_fname(fname); - if (partialptr) { - if (make_backups && !make_backup(fname)) - continue; - if (verbose > 2) { - rprintf(FINFO, "renaming %s to %s\n", - safe_fname(partialptr), - safe_fname(fname)); - } - if (do_rename(partialptr, fname) < 0) { - rsyserr(FERROR, errno, - "rename failed for %s (from %s)", - full_fname(fname), - safe_fname(partialptr)); - } else { - handle_partial_dir(partialptr, - PDIR_DELETE); - } - } + if (!redoing) { + if (read_batch) + flist_ndx_push(&batch_redo_list, ndx); + send_msg_int(MSG_REDO, ndx); + file->flags |= FLAG_FILE_SENT; + } else if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); + break; + } + case -1: + if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); + break; } } + if (make_backups < 0) + make_backups = -make_backups; - if (delete_after && !local_name && flist->count > 0) - delete_files(flist); + if (phase == 2 && delay_updates) /* for protocol_version < 29 */ + handle_delayed_updates(local_name); if (verbose > 2) rprintf(FINFO,"recv_files finished\n");