--- embedaddon/rsync/receiver.c 2016/11/01 09:54:32 1.1.1.3 +++ embedaddon/rsync/receiver.c 2021/03/17 00:32:36 1.1.1.4 @@ -3,7 +3,7 @@ * * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * Copyright (C) 2003-2015 Wayne Davison + * Copyright (C) 2003-2020 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 @@ -24,6 +24,8 @@ extern int dry_run; extern int do_xfers; +extern int use_db; +extern int db_lax; extern int am_root; extern int am_server; extern int inc_recurse; @@ -39,7 +41,9 @@ extern int protocol_version; extern int relative_paths; extern int preserve_hard_links; extern int preserve_perms; +extern int write_devices; extern int preserve_xattrs; +extern int do_fsync; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; @@ -48,26 +52,30 @@ extern int append_mode; extern int sparse_files; extern int preallocate_files; extern int keep_partial; -extern int checksum_len; extern int checksum_seed; +extern int checksum_files; +extern int whole_file; extern int inplace; +extern int inplace_partial; extern int allowed_lull; extern int delay_updates; +extern int xfersum_type; +extern BOOL want_progress_now; extern mode_t orig_umask; extern struct stats stats; extern char *tmpdir; +extern char *dest_filter; extern char *partial_dir; extern char *basis_dir[MAX_BASIS_DIRS+1]; extern char sender_file_sum[MAX_DIGEST_LEN]; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern filter_rule_list daemon_filter_list; +extern OFF_T preallocated_len; -BOOL want_progress_now; - 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: */ +/* This is non-0 when we are updating the basis file or an identical copy: */ static int updating_basis_or_equiv; #define TMPNAME_SUFFIX ".XXXXXX" @@ -214,7 +222,7 @@ int open_tmpfile(char *fnametmp, const char *fname, st * information should have been previously transferred, but that may * not be the case with -R */ if (fd == -1 && relative_paths && errno == ENOENT - && make_path(fnametmp, MKP_SKIP_SLASH | MKP_DROP_NAME) == 0) { + && make_path(fnametmp, ACCESSPERMS, MKP_SKIP_SLASH | MKP_DROP_NAME) == 0) { /* Get back to name with XXXXXX in it. */ get_tmpname(fnametmp, fname, False); fd = do_mkstemp(fnametmp, (file->mode|added_perms) & INITACCESSPERMS); @@ -231,33 +239,38 @@ int open_tmpfile(char *fnametmp, const char *fname, st } static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, - const char *fname, int fd, OFF_T total_size) + const char *fname, int fd, struct file_struct *file, int inplace_sizing) { static char file_sum1[MAX_DIGEST_LEN]; struct map_struct *mapbuf; struct sum_struct sum; + int sum_len; int32 len; + OFF_T total_size = F_LENGTH(file); OFF_T offset = 0; OFF_T offset2; char *data; int32 i; char *map = NULL; -#ifdef SUPPORT_PREALLOCATION -#ifdef PREALLOCATE_NEEDS_TRUNCATE - OFF_T preallocated_len = 0; -#endif - if (preallocate_files && fd != -1 && total_size > 0 && (!inplace || total_size > size_r)) { +#ifdef SUPPORT_PREALLOCATION + if (preallocate_files && fd != -1 && total_size > 0 && (!inplace_sizing || total_size > size_r)) { /* Try to preallocate enough space for file's eventual length. Can * reduce fragmentation on filesystems like ext4, xfs, and NTFS. */ - if (do_fallocate(fd, 0, total_size) == 0) { -#ifdef PREALLOCATE_NEEDS_TRUNCATE - preallocated_len = total_size; -#endif - } else + if ((preallocated_len = do_fallocate(fd, 0, total_size)) < 0) rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(fname)); - } + } else #endif + if (inplace_sizing) { +#ifdef HAVE_FTRUNCATE + /* The most compatible way to create a sparse file is to start with no length. */ + if (sparse_files > 0 && whole_file && fd >= 0 && do_ftruncate(fd, 0) == 0) + preallocated_len = 0; + else +#endif + preallocated_len = size_r; + } else + preallocated_len = 0; read_sum_head(f_in, &sum); @@ -271,7 +284,7 @@ static int receive_data(int f_in, char *fname_r, int f } else mapbuf = NULL; - sum_init(checksum_seed); + sum_init(xfersum_type, checksum_seed); if (append_mode > 0) { OFF_T j; @@ -304,11 +317,6 @@ static int receive_data(int f_in, char *fname_r, int f while ((i = recv_token(f_in, &data)) != 0) { if (INFO_GTE(PROGRESS, 1)) show_progress(offset, total_size); - else if (want_progress_now) { - rprintf(FINFO, "%s\n", fname); - end_progress(offset); - } - want_progress_now = False; if (allowed_lull) maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH | MSK_ACTIVE_RECEIVER); @@ -324,7 +332,7 @@ static int receive_data(int f_in, char *fname_r, int f sum_update(data, i); - if (fd != -1 && write_file(fd,data,i) != i) + if (fd != -1 && write_file(fd, 0, offset, data, i) != i) goto report_write_error; offset += i; continue; @@ -354,70 +362,64 @@ static int receive_data(int f_in, char *fname_r, int f if (updating_basis_or_equiv) { if (offset == offset2 && fd != -1) { - OFF_T pos; - if (flush_write_file(fd) < 0) + if (skip_matched(fd, offset, map, len) < 0) goto report_write_error; offset += len; - if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) { - rsyserr(FERROR_XFER, errno, - "lseek of %s returned %s, not %s", - full_fname(fname), - big_num(pos), big_num(offset)); - exit_cleanup(RERR_FILEIO); - } continue; } } - if (fd != -1 && map && write_file(fd, map, len) != (int)len) + if (fd != -1 && map && write_file(fd, 0, offset, map, len) != (int)len) goto report_write_error; offset += len; } - if (flush_write_file(fd) < 0) - goto report_write_error; + if (fd != -1 && offset > 0) { + if (sparse_files > 0) { + if (sparse_end(fd, offset) != 0) + goto report_write_error; + } else if (flush_write_file(fd) < 0) { + report_write_error: + rsyserr(FERROR_XFER, errno, "write failed on %s", full_fname(fname)); + exit_cleanup(RERR_FILEIO); + } + } #ifdef HAVE_FTRUNCATE /* inplace: New data could be shorter than old data. * preallocate_files: total_size could have been an overestimate. * Cut off any extra preallocated zeros from dest file. */ - if ((inplace -#ifdef PREALLOCATE_NEEDS_TRUNCATE - || preallocated_len > offset -#endif - ) && fd != -1 && do_ftruncate(fd, offset) < 0) { - rsyserr(FERROR_XFER, errno, "ftruncate failed on %s", - full_fname(fname)); + if ((inplace_sizing || preallocated_len > offset) && fd != -1 && !IS_DEVICE(file->mode)) { + if (do_ftruncate(fd, offset) < 0) + rsyserr(FERROR_XFER, errno, "ftruncate failed on %s", full_fname(fname)); } #endif if (INFO_GTE(PROGRESS, 1)) end_progress(total_size); - if (fd != -1 && offset > 0 && sparse_end(fd, offset) != 0) { - report_write_error: - rsyserr(FERROR_XFER, errno, "write failed on %s", + sum_len = sum_end(file_sum1); + + if (do_fsync && fd != -1 && fsync(fd) != 0) { + rsyserr(FERROR, errno, "fsync failed on %s", full_fname(fname)); exit_cleanup(RERR_FILEIO); } - if (sum_end(file_sum1) != checksum_len) - overflow_exit("checksum_len"); /* Impossible... */ - if (mapbuf) unmap_file(mapbuf); - read_buf(f_in, sender_file_sum, checksum_len); + read_buf(f_in, sender_file_sum, sum_len); if (DEBUG_GTE(DELTASUM, 2)) rprintf(FINFO,"got file_sum\n"); - if (fd != -1 && memcmp(file_sum1, sender_file_sum, checksum_len) != 0) + if (fd != -1 && memcmp(file_sum1, sender_file_sum, sum_len) != 0) return 0; return 1; } -static void discard_receive_data(int f_in, OFF_T length) +static void discard_receive_data(int f_in, struct file_struct *file) { - receive_data(f_in, NULL, -1, 0, NULL, -1, length); + receive_data(f_in, NULL, -1, 0, NULL, -1, file, 0); } static void handle_delayed_updates(char *local_name) @@ -429,7 +431,7 @@ static void handle_delayed_updates(char *local_name) 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, False)) + if (make_backups > 1 && !make_backup(fname, False)) continue; if (DEBUG_GTE(RECV, 1)) { rprintf(FINFO, "renaming %s to %s\n", @@ -442,7 +444,7 @@ static void handle_delayed_updates(char *local_name) "rename failed for %s (from %s)", full_fname(fname), partialptr); } else { - if (remove_source_files + if (remove_source_files || checksum_files & CSF_UPDATE || (preserve_hard_links && F_IS_HLINKED(file))) send_msg_int(MSG_SUCCESS, ndx); handle_partial_dir(partialptr, PDIR_DELETE); @@ -528,9 +530,10 @@ int recv_files(int f_in, int f_out, char *local_name) int iflags, xlen; char *fname, fbuf[MAXPATHLEN]; char xname[MAXPATHLEN]; - char fnametmp[MAXPATHLEN]; + char *fnametmp, fnametmpbuf[MAXPATHLEN]; char *fnamecmp, *partialptr; char fnamecmpbuf[MAXPATHLEN]; + char *filter_argv[MAX_FILTER_ARGS + 1]; uchar fnamecmp_type; struct file_struct *file; int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i; @@ -540,7 +543,8 @@ int recv_files(int f_in, int f_out, char *local_name) #ifdef SUPPORT_ACLS const char *parent_dirname = ""; #endif - int ndx, recv_ok; + int ndx, recv_ok, one_inplace; + pid_t pid = 0; if (DEBUG_GTE(RECV, 1)) rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used); @@ -548,6 +552,28 @@ int recv_files(int f_in, int f_out, char *local_name) if (delay_updates) delayed_bits = bitbag_create(cur_flist->used + 1); + if (use_db && (append_mode == 1 || protocol_version < 30)) + use_db = 0; /* We can't note finished md5 values */ + + if (dest_filter) { + char *p; + char *sep = " \t"; + int i; + for (p = strtok(dest_filter, sep), i = 0; + p && i < MAX_FILTER_ARGS; + p = strtok(0, sep)) + filter_argv[i++] = p; + filter_argv[i] = NULL; + if (p) { + rprintf(FERROR, + "Too many arguments to dest-filter (> %d)\n", + MAX_FILTER_ARGS); + exit_cleanup(RERR_SYNTAX); + } + } + + progress_init(); + while (1) { cleanup_disable(); @@ -555,9 +581,10 @@ int recv_files(int f_in, int f_out, char *local_name) ndx = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type, xname, &xlen); if (ndx == NDX_DONE) { - if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) { + if (!am_server && cur_flist) { set_current_file_index(NULL, 0); - end_progress(0); + if (INFO_GTE(PROGRESS, 2)) + end_progress(0); } if (inc_recurse && first_flist) { if (read_batch) { @@ -590,6 +617,12 @@ int recv_files(int f_in, int f_out, char *local_name) if (DEBUG_GTE(RECV, 1)) rprintf(FINFO, "recv_files(%s)\n", fname); + if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0') + && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { + rprintf(FERROR, "attempt to hack rsync failed.\n"); + exit_cleanup(RERR_PROTOCOL); + } + #ifdef SUPPORT_XATTRS if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))) @@ -651,19 +684,13 @@ int recv_files(int f_in, int f_out, char *local_name) stats.created_files++; } - if (!am_server && INFO_GTE(PROGRESS, 1)) + if (!am_server) set_current_file_index(file, ndx); stats.xferred_files++; stats.total_transferred_size += F_LENGTH(file); cleanup_got_literal = 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 (read_batch) { int wanted = redoing ? we_want_redo(ndx) @@ -673,7 +700,7 @@ int recv_files(int f_in, int f_out, char *local_name) "(Skipping batched update for%s \"%s\")\n", redoing ? " resend of" : "", fname); - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); file->flags |= FLAG_FILE_SENT; continue; } @@ -684,13 +711,13 @@ int recv_files(int f_in, int f_out, char *local_name) if (!do_xfers) { /* log the transfer */ log_item(FCLIENT, file, iflags, NULL); if (read_batch) - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); continue; } if (write_batch < 0) { log_item(FCLIENT, file, iflags, NULL); if (!am_server) - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); if (inc_recurse) send_msg_int(MSG_SUCCESS, ndx); continue; @@ -735,14 +762,14 @@ int recv_files(int f_in, int f_out, char *local_name) break; } if (!fnamecmp || (daemon_filter_list.head - && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) { + && check_filter(&daemon_filter_list, FLOG, fnamecmp, 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 (inplace && make_backups > 1) { if (!(fnamecmp = get_backup_name(fname))) fnamecmp = fname; else @@ -759,6 +786,7 @@ int recv_files(int f_in, int f_out, char *local_name) if (fd1 == -1 && protocol_version < 29) { if (fnamecmp != fname) { fnamecmp = fname; + fnamecmp_type = FNAMECMP_FNAME; fd1 = do_open(fnamecmp, O_RDONLY, 0); } @@ -767,12 +795,14 @@ int recv_files(int f_in, int f_out, char *local_name) pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[0], fname); fnamecmp = fnamecmpbuf; + fnamecmp_type = FNAMECMP_BASIS_DIR_LOW; fd1 = do_open(fnamecmp, O_RDONLY, 0); } } - updating_basis_or_equiv = inplace - && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP); + one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR; + updating_basis_or_equiv = one_inplace + || (inplace && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP)); if (fd1 == -1) { st.st_mode = 0; @@ -780,7 +810,7 @@ int recv_files(int f_in, int f_out, char *local_name) } else if (do_fstat(fd1,&st) != 0) { rsyserr(FERROR_XFER, errno, "fstat %s failed", full_fname(fnamecmp)); - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); close(fd1); if (inc_recurse) send_msg_int(MSG_NO_SEND, ndx); @@ -795,18 +825,21 @@ int recv_files(int f_in, int f_out, char *local_name) */ rprintf(FERROR_XFER, "recv_files: %s is a directory\n", full_fname(fnamecmp)); - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); close(fd1); if (inc_recurse) send_msg_int(MSG_NO_SEND, ndx); continue; } - if (fd1 != -1 && !S_ISREG(st.st_mode)) { + if (fd1 != -1 && !(S_ISREG(st.st_mode) || (write_devices && IS_DEVICE(st.st_mode)))) { close(fd1); fd1 = -1; } + if (fd1 != -1 && IS_DEVICE(st.st_mode) && st.st_size == 0) + st.st_size = get_device_size(fd1, fname); + /* If we're not preserving permissions, change the file-list's * mode based on the local permissions and some heuristics. */ if (!preserve_perms) { @@ -819,26 +852,27 @@ int recv_files(int f_in, int f_out, char *local_name) parent_dirname = dn; } #endif - file->mode = dest_mode(file->mode, st.st_mode, - dflt_perms, exists); + file->mode = dest_mode(file->mode, st.st_mode, dflt_perms, exists); } /* We now check to see if we are writing the file "inplace" */ - if (inplace) { - fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600); + if (inplace || one_inplace) { + fnametmp = one_inplace ? partialptr : fname; + fd2 = do_open(fnametmp, O_WRONLY|O_CREAT, 0600); if (fd2 == -1) { rsyserr(FERROR_XFER, errno, "open %s failed", - full_fname(fname)); + full_fname(fnametmp)); } else if (updating_basis_or_equiv) cleanup_set(NULL, NULL, file, fd1, fd2); } else { + fnametmp = fnametmpbuf; fd2 = open_tmpfile(fnametmp, fname, file); if (fd2 != -1) cleanup_set(fnametmp, partialptr, file, fd1, fd2); } if (fd2 == -1) { - discard_receive_data(f_in, F_LENGTH(file)); + discard_receive_data(f_in, file); if (fd1 != -1) close(fd1); if (inc_recurse) @@ -852,11 +886,15 @@ int recv_files(int f_in, int f_out, char *local_name) else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1)) rprintf(FINFO, "%s\n", fname); + if (dest_filter) + pid = run_filter(filter_argv, fd2, &fd2); + /* recv file data */ - recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, F_LENGTH(file)); + recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file, inplace || one_inplace); log_item(log_code, file, iflags, NULL); + if (want_progress_now) + instant_progress(fname); if (fd1 != -1) close(fd1); @@ -866,22 +904,34 @@ int recv_files(int f_in, int f_out, char *local_name) exit_cleanup(RERR_FILEIO); } + if (dest_filter) { + int status; + wait_process_with_flush(pid, &status); + if (status != 0) { + rprintf(FERROR, "filter %s exited code: %d\n", + dest_filter, status); + continue; + } + } + if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { if (partialptr == fname) partialptr = NULL; - if (!finish_transfer(fname, fnametmp, fnamecmp, - partialptr, file, recv_ok, 1)) + if (!finish_transfer(fname, fnametmp, fnamecmp, partialptr, file, recv_ok, 1)) recv_ok = -1; else if (fnamecmp == partialptr) { - do_unlink(partialptr); + if (!one_inplace) + do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } - } else if (keep_partial && partialptr) { + if (use_db && do_lstat(fname, &st) == 0) + db_set_checksum(5, &st, sender_file_sum); + } else if (keep_partial && partialptr && !one_inplace) { 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"); + "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, @@ -889,10 +939,12 @@ int recv_files(int f_in, int f_out, char *local_name) recv_ok = -1; else if (delay_updates && recv_ok) { bitbag_set_bit(delayed_bits, ndx); + if (use_db && do_lstat(partialptr, &st) == 0) + db_set_checksum(5, &st, sender_file_sum); recv_ok = 2; } else partialptr = NULL; - } else + } else if (!one_inplace) do_unlink(fnametmp); cleanup_disable(); @@ -904,7 +956,7 @@ int recv_files(int f_in, int f_out, char *local_name) case 2: break; case 1: - if (remove_source_files || inc_recurse + if (remove_source_files || inc_recurse || checksum_files & CSF_UPDATE || (preserve_hard_links && F_IS_HLINKED(file))) send_msg_int(MSG_SUCCESS, ndx); break; @@ -939,7 +991,7 @@ int recv_files(int f_in, int f_out, char *local_name) } else if (inc_recurse) send_msg_int(MSG_NO_SEND, ndx); break; - } + } case -1: if (inc_recurse) send_msg_int(MSG_NO_SEND, ndx);