-/* -*- c-file-style: "linux" -*-
-
- rsync -- fast file replication program
-
- Copyright (C) 1996-2000 by Andrew Tridgell
- Copyright (C) Paul Mackerras 1996
- Copyright (C) 2002 by Martin Pool <mbp@samba.org>
-
- 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 that are exclusive to the generator process.
+ *
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005, 2006 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.
+ *
+ * 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.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
#include "rsync.h"
extern int verbose;
extern int dry_run;
-extern int log_format_has_i;
-extern int log_format_has_o_or_i;
-extern int daemon_log_format_has_i;
+extern int do_xfers;
+extern int stdout_format_has_i;
+extern int logfile_format_has_i;
extern int am_root;
extern int am_server;
extern int am_daemon;
+extern int do_progress;
extern int relative_paths;
+extern int implied_dirs;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_devices;
+extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
extern int omit_dir_times;
+extern int delete_mode;
+extern int delete_before;
extern int delete_during;
-extern int remove_sent_files;
+extern int delete_after;
+extern int module_id;
+extern int ignore_errors;
+extern int remove_source_files;
+extern int delay_updates;
extern int update_only;
-extern int opt_ignore_existing;
+extern int ignore_existing;
+extern int ignore_non_existing;
extern int inplace;
+extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
-extern int io_timeout;
+extern OFF_T min_size;
+extern int io_error;
+extern int allowed_lull;
+extern int sock_f_out;
+extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
+extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
extern int compare_dest;
+extern int copy_dest;
extern int link_dest;
extern int whole_file;
-extern int local_server;
extern int list_only;
+extern int new_root_dir;
extern int read_batch;
-extern int only_existing;
-extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
+extern int max_delete;
+extern int force_delete;
+extern int one_file_system;
extern struct stats stats;
-
+extern dev_t filesystem_dev;
+extern char *backup_dir;
+extern char *backup_suffix;
+extern int backup_suffix_len;
+extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+int ignore_perishable = 0;
+int non_perishable_cnt = 0;
+int maybe_ATTRS_REPORT = 0;
+
+static int deletion_count = 0; /* used to implement --max-delete */
+static int deldelay_size = 0, deldelay_cnt = 0;
+static char *deldelay_buf = NULL;
+static int deldelay_fd = -1;
+static BOOL solo_file = 0;
+
+/* For calling delete_item() and delete_dir_contents(). */
+#define DEL_RECURSE (1<<1) /* recurse */
+#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
+
+enum nonregtype {
+ TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
+};
+
+enum delret {
+ DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY
+};
+
+/* Forward declaration for delete_item(). */
+static enum delret delete_dir_contents(char *fname, int flags);
+
+
+static int is_backup_file(char *fn)
{
- if (preserve_perms
- && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
- return 0;
+ int k = strlen(fn) - backup_suffix_len;
+ return k > 0 && strcmp(fn+k, backup_suffix) == 0;
+}
+
+/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
+ * delete recursively.
+ *
+ * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
+ * a directory! (The buffer is used for recursion, but returned unchanged.)
+ */
+static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+{
+ enum delret ret;
+ char *what;
+ int ok;
+
+ if (verbose > 2) {
+ rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
+ fbuf, mode, flags);
+ }
+
+ if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+ ignore_perishable = 1;
+ /* If DEL_RECURSE is not set, this just reports emptiness. */
+ ret = delete_dir_contents(fbuf, flags);
+ ignore_perishable = 0;
+ if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
+ goto check_ret;
+ /* OK: try to delete the directory. */
+ }
+
+ if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
+ return DR_AT_LIMIT;
+
+ if (S_ISDIR(mode)) {
+ what = "rmdir";
+ ok = do_rmdir(fbuf) == 0;
+ } else if (make_backups && (backup_dir || !is_backup_file(fbuf))) {
+ what = "make_backup";
+ ok = make_backup(fbuf);
+ } else {
+ what = "unlink";
+ ok = robust_unlink(fbuf) == 0;
+ }
+
+ if (ok) {
+ if (!replace)
+ log_delete(fbuf, mode);
+ ret = DR_SUCCESS;
+ } else {
+ if (S_ISDIR(mode) && errno == ENOTEMPTY) {
+ rprintf(FINFO, "cannot delete non-empty directory: %s\n",
+ fbuf);
+ ret = DR_NOT_EMPTY;
+ } else if (errno != ENOENT) {
+ rsyserr(FERROR, errno, "delete_file: %s(%s) failed",
+ what, fbuf);
+ ret = DR_FAILURE;
+ } else {
+ deletion_count--;
+ ret = DR_SUCCESS;
+ }
+ }
+
+ check_ret:
+ if (replace && ret != DR_SUCCESS) {
+ rprintf(FERROR, "could not make way for new %s: %s\n",
+ replace, fbuf);
+ }
+ return ret;
+}
+
+/* The directory is about to be deleted: if DEL_RECURSE is given, delete all
+ * its contents, otherwise just checks for content. Returns DR_SUCCESS or
+ * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The
+ * buffer is used for recursion, but returned unchanged.)
+ */
+static enum delret delete_dir_contents(char *fname, int flags)
+{
+ struct file_list *dirlist;
+ enum delret ret;
+ unsigned remainder;
+ void *save_filters;
+ int j, dlen;
+ char *p;
+
+ if (verbose > 3) {
+ rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n",
+ fname, flags);
+ }
+
+ dlen = strlen(fname);
+ save_filters = push_local_filters(fname, dlen);
+
+ non_perishable_cnt = 0;
+ dirlist = get_dirlist(fname, dlen, 0);
+ ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
+
+ if (!dirlist->count)
+ goto done;
- if (am_root && preserve_uid && st->st_uid != file->uid)
+ if (!(flags & DEL_RECURSE)) {
+ ret = DR_NOT_EMPTY;
+ goto done;
+ }
+
+ p = fname + dlen;
+ if (dlen != 1 || *fname != '/')
+ *p++ = '/';
+ remainder = MAXPATHLEN - (p - fname);
+
+ /* We do our own recursion, so make delete_item() non-recursive. */
+ flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
+
+ for (j = dirlist->count; j--; ) {
+ struct file_struct *fp = dirlist->files[j];
+
+ if (fp->flags & FLAG_MOUNT_DIR) {
+ if (verbose > 1) {
+ rprintf(FINFO,
+ "mount point, %s, pins parent directory\n",
+ f_name(fp, NULL));
+ }
+ ret = DR_NOT_EMPTY;
+ continue;
+ }
+
+ strlcpy(p, fp->basename, remainder);
+ /* Save stack by recursing to ourself directly. */
+ if (S_ISDIR(fp->mode)
+ && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
+ if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
+ }
+
+ fname[dlen] = '\0';
+
+ done:
+ flist_free(dirlist);
+ pop_local_filters(save_filters);
+
+ if (ret == DR_NOT_EMPTY) {
+ rprintf(FINFO, "cannot delete non-empty directory: %s\n",
+ fname);
+ }
+ return ret;
+}
+
+static int start_delete_delay_temp(void)
+{
+ char fnametmp[MAXPATHLEN];
+ int save_dry_run = dry_run;
+
+ dry_run = 0;
+ if (!get_tmpname(fnametmp, "deldelay")
+ || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) {
+ rprintf(FINFO, "NOTE: Unable to create delete-delay temp file--"
+ "switching to --delete-after.\n");
+ delete_during = 0;
+ delete_after = 1;
+ dry_run = save_dry_run;
return 0;
+ }
+ unlink(fnametmp);
+ dry_run = save_dry_run;
+ return 1;
+}
- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+static int flush_delete_delay(void)
+{
+ if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) {
+ rsyserr(FERROR, errno, "flush of delete-delay buffer");
+ delete_during = 0;
+ delete_after = 1;
+ close(deldelay_fd);
return 0;
+ }
+ deldelay_cnt = 0;
+ return 1;
+}
+
+static int remember_delete(struct file_struct *file, const char *fname)
+{
+ int len;
+
+ while (1) {
+ len = snprintf(deldelay_buf + deldelay_cnt,
+ deldelay_size - deldelay_cnt,
+ "%x %s%c", (int)file->mode, fname, '\0');
+ if ((deldelay_cnt += len) <= deldelay_size)
+ break;
+ if (deldelay_fd < 0 && !start_delete_delay_temp())
+ return 0;
+ deldelay_cnt -= len;
+ if (!flush_delete_delay())
+ return 0;
+ }
return 1;
}
+static int read_delay_line(char *buf)
+{
+ static int read_pos = 0;
+ int j, len, mode;
+ char *bp, *past_space;
+
+ while (1) {
+ for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {}
+ if (j < deldelay_cnt)
+ break;
+ if (deldelay_fd < 0) {
+ if (j > read_pos)
+ goto invalid_data;
+ return -1;
+ }
+ deldelay_cnt -= read_pos;
+ if (deldelay_cnt == deldelay_size)
+ goto invalid_data;
+ if (deldelay_cnt && read_pos) {
+ memmove(deldelay_buf, deldelay_buf + read_pos,
+ deldelay_cnt);
+ }
+ len = read(deldelay_fd, deldelay_buf + deldelay_cnt,
+ deldelay_size - deldelay_cnt);
+ if (len == 0) {
+ if (deldelay_cnt) {
+ rprintf(FERROR,
+ "ERROR: unexpected EOF in delete-delay file.\n");
+ }
+ return -1;
+ }
+ if (len < 0) {
+ rsyserr(FERROR, errno,
+ "reading delete-delay file");
+ return -1;
+ }
+ deldelay_cnt += len;
+ read_pos = 0;
+ }
+
+ bp = deldelay_buf + read_pos;
-#define SID_UPDATING ITEM_UPDATING
-#define SID_REPORT_CHECKSUM ITEM_REPORT_CHECKSUM
-#define SID_USING_ALT_BASIS ITEM_USING_ALT_BASIS
-/* This flag doesn't get sent, so it must be outside 0xffff. */
-#define SID_NO_DEST_AND_NO_UPDATE (1<<16)
+ if (sscanf(bp, "%x ", &mode) != 1) {
+ invalid_data:
+ rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
+ return -1;
+ }
+ past_space = strchr(bp, ' ') + 1;
+ len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+ read_pos = j + 1;
-static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
- int32 sflags, int f_out, int ndx)
+ if (len > MAXPATHLEN) {
+ rprintf(FERROR, "ERROR: filename too long in delete-delay file.\n");
+ return -1;
+ }
+
+ /* The caller needs the name in a MAXPATHLEN buffer, so we copy it
+ * instead of returning a pointer to our buffer. */
+ memcpy(buf, past_space, len);
+
+ return mode;
+}
+
+static void do_delayed_deletions(char *delbuf)
{
- int iflags = sflags & 0xffff;
+ int mode;
- if (statret >= 0) {
- if (S_ISREG(file->mode) && file->length != st->st_size)
- iflags |= ITEM_REPORT_SIZE;
- if (!(sflags & SID_NO_DEST_AND_NO_UPDATE)) {
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? !omit_dir_times
- : !S_ISLNK(file->mode);
-
- if ((iflags & ITEM_UPDATING && !keep_time)
- || (keep_time && file->modtime != st->st_mtime))
- iflags |= ITEM_REPORT_TIME;
- if (preserve_perms && file->mode != st->st_mode)
- iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && file->uid != st->st_uid)
- iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && file->gid != GID_NONE
- && st->st_gid != file->gid)
- iflags |= ITEM_REPORT_GROUP;
+ if (deldelay_fd >= 0) {
+ if (deldelay_cnt && !flush_delete_delay())
+ return;
+ lseek(deldelay_fd, 0, 0);
+ }
+ while ((mode = read_delay_line(delbuf)) >= 0)
+ delete_item(delbuf, mode, NULL, DEL_RECURSE);
+ if (deldelay_fd >= 0)
+ close(deldelay_fd);
+}
+
+/* This function is used to implement per-directory deletion, and is used by
+ * all the --delete-WHEN options. Note that the fbuf pointer must point to a
+ * MAXPATHLEN buffer with the name of the directory in it (the functions we
+ * call will append names onto the end, but the old dir value will be restored
+ * on exit). */
+static void delete_in_dir(struct file_list *flist, char *fbuf,
+ struct file_struct *file, STRUCT_STAT *stp)
+{
+ static int min_depth = MAXPATHLEN, cur_depth = -1;
+ static void *filt_array[MAXPATHLEN/2+1];
+ static int already_warned = 0;
+ struct file_list *dirlist;
+ char delbuf[MAXPATHLEN];
+ int dlen, i;
+
+ if (!flist) {
+ while (cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ min_depth = MAXPATHLEN;
+ cur_depth = -1;
+ return;
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
+
+ if (allowed_lull)
+ maybe_send_keepalive();
+
+ if (file->dir.depth >= MAXPATHLEN/2+1)
+ return; /* Impossible... */
+
+ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+ if (already_warned)
+ return;
+ rprintf(FINFO,
+ "IO error encountered -- skipping file deletion\n");
+ already_warned = 1;
+ return;
+ }
+
+ while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ cur_depth = file->dir.depth;
+ if (min_depth > cur_depth)
+ min_depth = cur_depth;
+ dlen = strlen(fbuf);
+ filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+
+ if (one_file_system) {
+ if (file->flags & FLAG_TOP_DIR)
+ filesystem_dev = stp->st_dev;
+ else if (filesystem_dev != stp->st_dev)
+ return;
+ }
+
+ dirlist = get_dirlist(fbuf, dlen, 0);
+
+ /* If an item in dirlist is not found in flist, delete it
+ * from the filesystem. */
+ for (i = dirlist->count; i--; ) {
+ struct file_struct *fp = dirlist->files[i];
+ if (!F_IS_ACTIVE(fp))
+ continue;
+ if (fp->flags & FLAG_MOUNT_DIR) {
+ if (verbose > 1)
+ rprintf(FINFO, "cannot delete mount point: %s\n",
+ f_name(fp, NULL));
+ continue;
}
+ if (flist_find(flist, fp) < 0) {
+ f_name(fp, delbuf);
+ if (delete_during == 2) {
+ if (!remember_delete(fp, delbuf))
+ break;
+ } else
+ delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+ }
+ }
+
+ flist_free(dirlist);
+}
+
+/* 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. */
+static void do_delete_pass(struct file_list *flist)
+{
+ char fbuf[MAXPATHLEN];
+ STRUCT_STAT st;
+ int j;
+
+ /* dry_run is incremented when the destination doesn't exist yet. */
+ if (dry_run > 1 || list_only)
+ return;
+
+ for (j = 0; j < flist->count; j++) {
+ struct file_struct *file = flist->files[j];
+
+ if (!(file->flags & FLAG_XFER_DIR))
+ continue;
+
+ f_name(file, fbuf);
+ if (verbose > 1 && file->flags & FLAG_TOP_DIR)
+ rprintf(FINFO, "deleting in %s\n", fbuf);
+
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0
+ || !S_ISDIR(st.st_mode))
+ continue;
+
+ delete_in_dir(flist, fbuf, file, &st);
+ }
+ delete_in_dir(NULL, NULL, NULL, NULL);
+
+ if (do_progress && !am_server)
+ rprintf(FINFO, " \r");
+}
+
+int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+{
+ if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
+ return 0;
+
+ if (am_root && preserve_uid && st->st_uid != F_UID(file))
+ return 0;
+
+ if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
+ return 0;
+
+ return 1;
+}
+
+void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
+ int32 iflags, uchar fnamecmp_type, const char *xname)
+{
+ if (statret >= 0) { /* A from-dest-dir statret can == 1! */
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? !omit_dir_times
+ : !S_ISLNK(file->mode);
+
+ if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
+ iflags |= ITEM_REPORT_SIZE;
+ if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
+ && !(iflags & ITEM_MATCHED)
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ iflags |= ITEM_REPORT_TIME;
+ if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
+ iflags |= ITEM_REPORT_PERMS;
+ if (preserve_uid && am_root && F_UID(file) != st->st_uid)
+ iflags |= ITEM_REPORT_OWNER;
+ if (preserve_gid && F_GID(file) != GID_NONE
+ && st->st_gid != F_GID(file))
+ iflags |= ITEM_REPORT_GROUP;
} else
- iflags |= ITEM_IS_NEW | ITEM_UPDATING;
+ iflags |= ITEM_IS_NEW;
- if ((iflags || verbose > 1) && !read_batch) {
+ iflags &= 0xffff;
+ if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
+ || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
- write_int(f_out, ndx);
- write_shortint(f_out, iflags);
- } else if (ndx >= 0)
- log_recv(file, &stats, iflags);
+ write_int(sock_f_out, ndx);
+ write_shortint(sock_f_out, iflags);
+ if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+ write_byte(sock_f_out, fnamecmp_type);
+ if (iflags & ITEM_XNAME_FOLLOWS)
+ write_vstring(sock_f_out, xname, strlen(xname));
+ } else if (ndx >= 0) {
+ enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
+ log_item(code, file, &stats, iflags, xname);
+ }
}
}
/* Perform our quick-check heuristic for determining if a file is unchanged. */
-static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
- if (st->st_size != file->length)
+ if (st->st_size != F_LENGTH(file))
return 0;
/* if always checksum is set then we use the checksum instead
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
file_checksum(fn, sum, st->st_size);
- return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
- : MD4_SUM_LENGTH) == 0;
+ return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
if (size_only)
if (ignore_times)
return 0;
- return cmp_modtime(st->st_mtime, file->modtime) == 0;
+ return cmp_time(st->st_mtime, file->modtime) == 0;
}
* The block size is a rounded square root of file length.
*
* The checksum size is determined according to:
- * blocksum_bits = BLOCKSUM_EXP + 2*log2(file_len) - log2(block_len)
+ * blocksum_bits = BLOCKSUM_BIAS + 2*log2(file_len) - log2(block_len)
* provided by Donovan Baarda which gives a probability of rsync
* algorithm corrupting data and falling back using the whole md4
* checksums.
int64 l;
int b = BLOCKSUM_BIAS;
for (l = len; l >>= 1; b += 2) {}
- for (c = blength; c >>= 1 && b; b--) {}
+ for (c = blength; (c >>= 1) && b; b--) {}
/* add a bit, subtract rollsum, round up. */
s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
s2length = MAX(s2length, csum_length);
sum->flength = len;
sum->blength = blength;
sum->s2length = s2length;
- sum->count = (len + (blength - 1)) / blength;
- sum->remainder = (len % blength);
+ sum->remainder = (int32)(len % blength);
+ sum->count = (int32)(len / blength) + (sum->remainder != 0);
if (sum->count && verbose > 2) {
rprintf(FINFO,
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
+ write_sum_head(f_out, &sum);
+
+ if (append_mode > 0 && f_copy < 0)
+ return;
if (len > 0)
mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
else
mapbuf = NULL;
- write_sum_head(f_out, &sum);
-
for (i = 0; i < sum.count; i++) {
int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
char *map = map_ptr(mapbuf, offset, n1);
- uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
+ uint32 sum1;
- if (f_copy >= 0)
+ len -= n1;
+ offset += n1;
+
+ if (f_copy >= 0) {
full_write(f_copy, map, n1);
+ if (append_mode > 0)
+ continue;
+ }
+ sum1 = get_checksum1(map, n1);
get_checksum2(map, n1, sum2);
if (verbose > 3) {
rprintf(FINFO,
"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
- (double)i, (double)offset, (long)n1,
+ (double)i, (double)offset - n1, (long)n1,
(unsigned long)sum1);
}
write_int(f_out, sum1);
write_buf(f_out, sum2, sum.s2length);
- len -= n1;
- offset += n1;
}
if (mapbuf)
{
int fname_len, fname_suf_len;
const char *fname_suf, *fname = file->basename;
- uint32 lowest_dist = 0x7FFFFFFF;
+ uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
int j, lowest_j = -1;
fname_len = strlen(fname);
int len, suf_len;
uint32 dist;
- if (!S_ISREG(fp->mode) || !fp->length
- || fp->flags & FLAG_NO_FUZZY)
+ if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_SENT)
continue;
name = fp->basename;
- if (fp->length == file->length
- && fp->modtime == file->modtime) {
+ if (F_LENGTH(fp) == F_LENGTH(file)
+ && cmp_time(fp->modtime, file->modtime) == 0) {
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
return lowest_j;
}
+#ifdef SUPPORT_HARD_LINKS
+void check_for_finished_hlinks(int itemizing, enum logcode code)
+{
+ struct file_struct *file;
+ char fbuf[MAXPATHLEN];
+ int ndx;
+
+ while ((ndx = get_hlink_num()) != -1) {
+ if (ndx < 0 || ndx >= the_file_list->count)
+ continue;
+
+ file = the_file_list->files[ndx];
+ if (!F_IS_HLINKED(file))
+ continue;
+
+ finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
+ }
+}
+#endif
+
+/* This is only called for regular files. We return -2 if we've finished
+ * handling the file, -1 if no dest-linking occurred, or a non-negative
+ * value if we found an alternate basis file. */
+static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
+ char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+ enum logcode code)
+{
+ int best_match = -1;
+ int match_level = 0;
+ int j = 0;
+
+ do {
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
+ continue;
+ switch (match_level) {
+ case 0:
+ best_match = j;
+ match_level = 1;
+ /* FALL THROUGH */
+ case 1:
+ if (!unchanged_file(cmpbuf, file, stp))
+ continue;
+ best_match = j;
+ match_level = 2;
+ /* FALL THROUGH */
+ case 2:
+ if (!unchanged_attrs(file, stp))
+ continue;
+ if (always_checksum && preserve_times
+ && cmp_time(stp->st_mtime, file->modtime))
+ continue;
+ best_match = j;
+ match_level = 3;
+ break;
+ }
+ break;
+ } while (basis_dir[++j] != NULL);
+
+ if (!match_level)
+ return -1;
+
+ if (j != best_match) {
+ j = best_match;
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0)
+ return -1;
+ }
+
+ if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
+ if (link_dest) {
+ if (!hard_link_one(file, fname, cmpbuf, 1))
+ goto try_a_copy;
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, stp, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+ itemize(file, ndx, 1, stp,
+ ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+ 0, "");
+ }
+ } else
+#endif
+ if (itemizing)
+ itemize(file, ndx, 0, stp, 0, 0, NULL);
+ if (verbose > 1 && maybe_ATTRS_REPORT)
+ rprintf(FCLIENT, "%s is uptodate\n", fname);
+ return -2;
+ }
+
+ if (match_level >= 2) {
+#ifdef SUPPORT_HARD_LINKS
+ try_a_copy: /* Copy the file locally. */
+#endif
+ if (copy_file(cmpbuf, fname, file->mode) < 0) {
+ if (verbose) {
+ rsyserr(FINFO, errno, "copy_file %s => %s",
+ full_fname(cmpbuf), fname);
+ }
+ return -1;
+ }
+ if (itemizing)
+ itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
+ set_file_attrs(fname, file, NULL, 0);
+ if (maybe_ATTRS_REPORT
+ && ((!itemizing && verbose && match_level == 2)
+ || (verbose > 1 && match_level == 3))) {
+ code = match_level == 3 ? FCLIENT : FINFO;
+ rprintf(code, "%s%s\n", fname,
+ match_level == 3 ? " is uptodate" : "");
+ }
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, stp, itemizing, code, -1);
+#endif
+ return -2;
+ }
+
+ return FNAMECMP_BASIS_DIR_LOW + j;
+}
+
+/* This is only called for non-regular files. We return -2 if we've finished
+ * handling the file, or -1 if no dest-linking occurred, or a non-negative
+ * value if we found an alternate basis file. */
+static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+ char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+ enum logcode code)
+{
+ char lnk[MAXPATHLEN];
+ int best_match = -1;
+ int match_level = 0;
+ enum nonregtype type;
+ uint32 *devp;
+ int len, j = 0;
+
+#ifndef SUPPORT_LINKS
+ if (S_ISLNK(file->mode))
+ return -1;
+#endif
+ if (S_ISDIR(file->mode)) {
+ type = TYPE_DIR;
+ } else if (IS_SPECIAL(file->mode))
+ type = TYPE_SPECIAL;
+ else if (IS_DEVICE(file->mode))
+ type = TYPE_DEVICE;
+#ifdef SUPPORT_LINKS
+ else if (S_ISLNK(file->mode))
+ type = TYPE_SYMLINK;
+#endif
+ else {
+ rprintf(FERROR,
+ "internal: try_dests_non() called with invalid mode (%o)\n",
+ (int)file->mode);
+ exit_cleanup(RERR_UNSUPPORTED);
+ }
+
+ do {
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0)
+ continue;
+ switch (type) {
+ case TYPE_DIR:
+ if (!S_ISDIR(stp->st_mode))
+ continue;
+ break;
+ case TYPE_SPECIAL:
+ if (!IS_SPECIAL(stp->st_mode))
+ continue;
+ break;
+ case TYPE_DEVICE:
+ if (!IS_DEVICE(stp->st_mode))
+ continue;
+ break;
+#ifdef SUPPORT_LINKS
+ case TYPE_SYMLINK:
+ if (!S_ISLNK(stp->st_mode))
+ continue;
+ break;
+#endif
+ }
+ if (match_level < 1) {
+ match_level = 1;
+ best_match = j;
+ }
+ switch (type) {
+ case TYPE_DIR:
+ break;
+ case TYPE_SPECIAL:
+ case TYPE_DEVICE:
+ devp = F_RDEV_P(file);
+ if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
+ continue;
+ break;
+#ifdef SUPPORT_LINKS
+ case TYPE_SYMLINK:
+ if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
+ continue;
+ lnk[len] = '\0';
+ if (strcmp(lnk, F_SYMLINK(file)) != 0)
+ continue;
+ break;
+#endif
+ }
+ if (match_level < 2) {
+ match_level = 2;
+ best_match = j;
+ }
+ if (unchanged_attrs(file, stp)) {
+ match_level = 3;
+ best_match = j;
+ break;
+ }
+ } while (basis_dir[++j] != NULL);
+
+ if (!match_level)
+ return -1;
+
+ if (j != best_match) {
+ j = best_match;
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0)
+ return -1;
+ }
+
+ if (match_level == 3) {
+#ifdef SUPPORT_HARD_LINKS
+ if (link_dest
+#ifndef CAN_HARDLINK_SYMLINK
+ && !S_ISLNK(file->mode)
+#endif
+#ifndef CAN_HARDLINK_SPECIAL
+ && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
+#endif
+ && !S_ISDIR(file->mode)) {
+ if (do_link(cmpbuf, fname) < 0) {
+ rsyserr(FERROR, errno,
+ "failed to hard-link %s with %s",
+ cmpbuf, fname);
+ return j;
+ }
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
+ } else
+#endif
+ match_level = 2;
+ if (itemizing && stdout_format_has_i
+ && (verbose > 1 || stdout_format_has_i > 1)) {
+ int chg = compare_dest && type != TYPE_DIR ? 0
+ : ITEM_LOCAL_CHANGE
+ + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
+ char *lp = match_level == 3 ? "" : NULL;
+ itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
+ }
+ if (verbose > 1 && maybe_ATTRS_REPORT) {
+ rprintf(FCLIENT, "%s%s is uptodate\n",
+ fname, type == TYPE_DIR ? "/" : "");
+ }
+ return -2;
+ }
+
+ return j;
+}
+
+static int phase = 0;
-/* Acts on flist->file's ndx'th item, whose name is fname. If a directory,
+/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
* make sure it exists, and has the right permissions/timestamp info. For
* all other non-regular files (symlinks, etc.) we create them here. For
* regular files that have changed, we try to find a basis file and then
* start sending checksums.
*
+ * When fname is non-null, it must point to a MAXPATHLEN buffer!
+ *
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
-static void recv_generator(char *fname, struct file_list *flist,
- struct file_struct *file, int ndx,
- int f_out, int f_out_name)
+static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ int itemizing, enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
- static char *fuzzy_dirname = NULL;
+ static const char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
+ static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
- STRUCT_STAT st, partial_st;
+ STRUCT_STAT st, real_st, partial_st;
struct file_struct *back_file = NULL;
- int statret, stat_errno;
+ int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
- int itemizing, maybe_PERMS_REPORT;
uchar fnamecmp_type;
- enum logcode code;
+ int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
if (list_only)
return;
- if (protocol_version >= 29) {
- itemizing = 1;
- code = daemon_log_format_has_i ? 0 : FLOG;
- maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
- } else if (am_daemon) {
- itemizing = daemon_log_format_has_i && !dry_run;
- code = itemizing || dry_run ? FCLIENT : FINFO;
- maybe_PERMS_REPORT = PERMS_REPORT;
- } else if (!am_server) {
- itemizing = log_format_has_i;
- code = itemizing ? 0 : FINFO;
- maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
- } else {
- itemizing = 0;
- code = FINFO;
- maybe_PERMS_REPORT = PERMS_REPORT;
- }
-
if (!fname) {
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
- fuzzy_dirname = NULL;
}
if (missing_below >= 0) {
- dry_run--;
+ if (dry_run)
+ dry_run--;
missing_below = -1;
}
+ parent_dirname = "";
return;
}
- if (verbose > 2) {
- rprintf(FINFO, "recv_generator(%s,%d)\n",
- safe_fname(fname), ndx);
- }
+ if (verbose > 2)
+ rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
if (server_filter_list.head) {
if (excluded_below >= 0) {
S_ISDIR(file->mode)) < 0) {
if (S_ISDIR(file->mode))
excluded_below = file->dir.depth;
- skipping:
+ skipping:
if (verbose) {
rprintf(FINFO,
"skipping server-excluded file \"%s\"\n",
- safe_fname(fname));
+ fname);
}
return;
}
}
- if (missing_below >= 0 && file->dir.depth <= missing_below) {
- dry_run--;
- missing_below = -1;
+ if (missing_below >= 0) {
+ if (file->dir.depth <= missing_below) {
+ if (dry_run)
+ dry_run--;
+ missing_below = -1;
+ } else if (!dry_run)
+ return;
}
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
} else {
- if (fuzzy_basis && S_ISREG(file->mode)) {
- char *dn = file->dirname ? file->dirname : ".";
- /* Yes, identical dirnames are guaranteed to have
- * identical pointers at this point. */
- if (fuzzy_dirname != dn) {
- if (fuzzy_dirlist)
- flist_free(fuzzy_dirlist);
- fuzzy_dirname = dn;
- fuzzy_dirlist = get_dirlist(fuzzy_dirname, 1);
+ const char *dn = file->dirname ? file->dirname : ".";
+ if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+ if (relative_paths && !implied_dirs
+ && do_stat(dn, &st) < 0
+ && create_directory_path(fname) < 0) {
+ rsyserr(FERROR, errno,
+ "recv_generator: mkdir %s failed",
+ full_fname(dn));
+ }
+ if (fuzzy_dirlist) {
+ flist_free(fuzzy_dirlist);
+ fuzzy_dirlist = NULL;
}
+ if (fuzzy_basis)
+ need_fuzzy_dirlist = 1;
+ }
+ parent_dirname = dn;
+
+ if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+ strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
+ fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
+ need_fuzzy_dirlist = 0;
}
statret = link_stat(fname, &st,
stat_errno = errno;
}
- if (only_existing && statret == -1 && stat_errno == ENOENT) {
- /* we only want to update existing files */
+ if (ignore_non_existing && statret == -1 && stat_errno == ENOENT) {
if (verbose > 1) {
- rprintf(FINFO, "not creating new file \"%s\"\n",
- safe_fname(fname));
+ rprintf(FINFO, "not creating new %s \"%s\"\n",
+ S_ISDIR(file->mode) ? "directory" : "file",
+ fname);
}
return;
}
- if (statret == 0 && !preserve_perms
- && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) {
- /* if the file exists already and we aren't perserving
- * permissions then act as though the remote end sent
- * us the file permissions we already have */
- file->mode = (file->mode & ~CHMOD_BITS)
- | (st.st_mode & CHMOD_BITS);
+ /* 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 = statret == 0
+ && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
+ file->mode = dest_mode(file->mode, st.st_mode, exists);
}
if (S_ISDIR(file->mode)) {
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- delete_file(fname, st.st_mode, DEL_TERSE);
+ if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
+ return;
statret = -1;
}
if (dry_run && statret != 0 && missing_below < 0) {
missing_below = file->dir.depth;
dry_run++;
}
- if (itemizing && f_out != -1)
- itemize(file, statret, &st, 0, f_out, ndx);
- if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
+ real_ret = statret;
+ real_st = st;
+ if (new_root_dir) {
+ if (*fname == '.' && fname[1] == '\0')
+ statret = -1;
+ new_root_dir = 0;
+ }
+ if (statret != 0 && basis_dir[0] != NULL) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, code);
+ if (j == -2) {
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
+ }
+ if (itemizing && f_out != -1) {
+ itemize(file, ndx, statret, &st,
+ statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
+ }
+ if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname, orig_umask) < 0
- || do_mkdir(fname, file->mode) < 0) {
+ || create_directory_path(fname) < 0
+ || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
+ file->flags |= FLAG_MISSING_DIR;
+ if (ndx+1 < the_file_list->count
+ && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
+ rprintf(FERROR,
+ "*** Skipping everything below this failed directory ***\n");
+ missing_below = file->dir.depth;
+ }
+ return;
}
}
- if (set_perms(fname, file, statret ? NULL : &st, 0)
- && verbose && code && f_out != -1)
- rprintf(code, "%s/\n", safe_fname(fname));
- if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
- && (file->flags & FLAG_DEL_HERE))
- delete_in_dir(flist, fname, file);
+ if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
+ && verbose && code != FNONE && f_out != -1)
+ rprintf(code, "%s/\n", fname);
+ if (real_ret != 0 && one_file_system)
+ real_st.st_dev = filesystem_dev;
+ if (delete_during && f_out != -1 && !phase && dry_run < 2
+ && (file->flags & FLAG_XFER_DIR))
+ delete_in_dir(the_file_list, fname, file, &real_st);
return;
}
- if (max_size && file->length > max_size) {
- if (verbose > 1) {
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
- }
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+ && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
return;
- }
+#endif
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
- if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
+ const char *sl = F_SYMLINK(file);
+ if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (verbose) {
+ if (solo_file)
+ fname = f_name(file, NULL);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname),
- safe_fname(file->u.link));
+ full_fname(fname), sl);
}
return;
}
char lnk[MAXPATHLEN];
int len;
- if (!S_ISDIR(st.st_mode)
- && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
- lnk[len] = 0;
- /* A link already pointing to the
- * right place -- no further action
- * required. */
- if (strcmp(lnk, file->u.link) == 0) {
- if (itemizing) {
- itemize(file, 0, &st, 0,
- f_out, ndx);
- }
- set_perms(fname, file, &st,
- maybe_PERMS_REPORT);
- return;
- }
+ if (!S_ISLNK(st.st_mode))
+ statret = -1;
+ else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
+ && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
+ /* The link is pointing to the right place. */
+ if (itemizing)
+ itemize(file, ndx, 0, &st, 0, 0, NULL);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
+ if (remove_source_files == 1)
+ goto return_with_success;
+ return;
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (S_ISLNK(st.st_mode))
- delete_file(fname, st.st_mode, DEL_TERSE);
- else {
- delete_file(fname, st.st_mode, DEL_TERSE);
- statret = -1;
- }
+ if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
+ return;
+ } else if (basis_dir[0] != NULL) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, code);
+ if (j == -2) {
+#ifndef CAN_HARDLINK_SYMLINK
+ if (link_dest) {
+ /* Resort to --copy-dest behavior. */
+ } else
+#endif
+ if (!copy_dest)
+ return;
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
}
- if (do_symlink(file->u.link,fname) != 0) {
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
+ return;
+#endif
+ if (do_symlink(sl, fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname), safe_fname(file->u.link));
+ full_fname(fname), sl);
} else {
- set_perms(fname,file,NULL,0);
+ set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
- itemize(file, statret, &st, SID_UPDATING,
- f_out, ndx);
- }
- if (code && verbose) {
- rprintf(code, "%s -> %s\n", safe_fname(fname),
- safe_fname(file->u.link));
- }
- if (remove_sent_files && !dry_run) {
- char numbuf[4];
- SIVAL(numbuf, 0, ndx);
- send_msg(MSG_SUCCESS, numbuf, 4);
+ itemize(file, ndx, statret, &st,
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
+ if (code != FNONE && verbose)
+ rprintf(code, "%s -> %s\n", fname, sl);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
+#endif
+ /* This does not check remove_source_files == 1
+ * because this is one of the items that the old
+ * --remove-sent-files option would remove. */
+ if (remove_source_files)
+ goto return_with_success;
}
#endif
return;
}
- if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
- if (statret != 0 ||
- st.st_mode != file->mode ||
- st.st_rdev != file->u.rdev) {
- if (IS_DEVICE(st.st_mode))
- delete_file(fname, st.st_mode, DEL_TERSE);
- else {
- delete_file(fname, st.st_mode, DEL_TERSE);
- statret = -1;
- }
- if (verbose > 2) {
- rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- safe_fname(fname),
- (int)file->mode, (int)file->u.rdev);
- }
- if (do_mknod(fname,file->mode,file->u.rdev) != 0) {
- rsyserr(FERROR, errno, "mknod %s failed",
- full_fname(fname));
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
+ uint32 *devp = F_RDEV_P(file);
+ dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+ if (statret == 0) {
+ char *t;
+ if (IS_DEVICE(file->mode)) {
+ if (!IS_DEVICE(st.st_mode))
+ statret = -1;
+ t = "device file";
} else {
- set_perms(fname,file,NULL,0);
- if (itemizing) {
- itemize(file, statret, &st, SID_UPDATING,
- f_out, ndx);
- }
- if (code && verbose) {
- rprintf(code, "%s\n",
- safe_fname(fname));
- }
+ if (!IS_SPECIAL(st.st_mode))
+ statret = -1;
+ t = "special file";
+ }
+ if (statret == 0
+ && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
+ && st.st_rdev == rdev) {
+ /* The device or special file is identical. */
+ if (itemizing)
+ itemize(file, ndx, 0, &st, 0, 0, NULL);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
+ if (remove_source_files == 1)
+ goto return_with_success;
+ return;
}
+ if (delete_item(fname, st.st_mode, t, del_opts) != 0)
+ return;
+ } else if (basis_dir[0] != NULL) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, code);
+ if (j == -2) {
+#ifndef CAN_HARDLINK_SPECIAL
+ if (link_dest) {
+ /* Resort to --copy-dest behavior. */
+ } else
+#endif
+ if (!copy_dest)
+ return;
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
+ }
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
+ return;
+#endif
+ if (verbose > 2) {
+ rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
+ fname, (int)file->mode,
+ (long)major(rdev), (long)minor(rdev));
+ }
+ if (do_mknod(fname, file->mode, rdev) < 0) {
+ rsyserr(FERROR, errno, "mknod %s failed",
+ full_fname(fname));
} else {
+ set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
- itemize(file, statret, &st, 0,
- f_out, ndx);
+ itemize(file, ndx, statret, &st,
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
- set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ if (code != FNONE && verbose)
+ rprintf(code, "%s\n", fname);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
+#endif
+ if (remove_source_files == 1)
+ goto return_with_success;
}
return;
}
- if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
+ if (!S_ISREG(file->mode)) {
+ if (solo_file)
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
+ }
- if (!S_ISREG(file->mode)) {
- rprintf(FINFO, "skipping non-regular file \"%s\"\n",
- safe_fname(fname));
+ if (max_size && F_LENGTH(file) > max_size) {
+ if (verbose > 1) {
+ if (solo_file)
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "%s is over max-size\n", fname);
+ }
+ return;
+ }
+ if (min_size && F_LENGTH(file) < min_size) {
+ if (verbose > 1) {
+ if (solo_file)
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "%s is under min-size\n", fname);
+ }
return;
}
- fnamecmp = fname;
- fnamecmp_type = FNAMECMP_FNAME;
+ if (ignore_existing && statret == 0) {
+ if (verbose > 1)
+ rprintf(FINFO, "%s exists\n", fname);
+ return;
+ }
- if (statret != 0 && basis_dir[0] != NULL) {
- int fallback_match = -1;
- int match_level = 0;
- int i = 0;
- do {
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- basis_dir[i], fname);
- if (link_stat(fnamecmpbuf, &st, 0) == 0
- && S_ISREG(st.st_mode)) {
- statret = 0;
- if (link_dest) {
- if (!match_level) {
- fallback_match = i;
- match_level = 1;
- } else if (match_level == 2
- && !unchanged_attrs(file, &st))
- continue;
- if (!unchanged_file(fnamecmpbuf, file, &st))
- continue;
- fallback_match = i;
- match_level = 2;
- if (!unchanged_attrs(file, &st))
- continue;
- }
- match_level = 3;
- break;
- }
- } while (basis_dir[++i] != NULL);
- if (statret == 0) {
- if (match_level < 3) {
- i = fallback_match;
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- basis_dir[i], fname);
- }
-#ifdef HAVE_LINK
- if (link_dest && match_level == 3 && !dry_run) {
- if (do_link(fnamecmpbuf, fname) < 0) {
- if (verbose) {
- rsyserr(FINFO, errno,
- "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
- }
- fnamecmp = fnamecmpbuf;
- fnamecmp_type = i;
- }
- } else
-#endif
- {
- fnamecmp = fnamecmpbuf;
- fnamecmp_type = i;
- }
- }
+ if (update_only && statret == 0
+ && cmp_time(st.st_mtime, file->modtime) > 0) {
+ if (verbose > 1)
+ rprintf(FINFO, "%s is newer\n", fname);
+ return;
}
+ fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_FNAME;
+
if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_file(fname, st.st_mode, DEL_TERSE) != 0)
+ if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
return;
statret = -1;
stat_errno = ENOENT;
}
+ if (statret != 0 && basis_dir[0] != NULL) {
+ int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, code);
+ if (j == -2) {
+ if (remove_source_files == 1)
+ goto return_with_success;
+ return;
+ }
+ if (j >= 0) {
+ fnamecmp = fnamecmpbuf;
+ fnamecmp_type = j;
+ statret = 0;
+ }
+ }
+
+ real_ret = statret;
+ real_st = st;
+
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
&& S_ISREG(partial_st.st_mode)) {
} else
partialptr = NULL;
- if (statret != 0 && fuzzy_basis && dry_run <= 1) {
+ if (statret != 0 && fuzzy_dirlist && dry_run <= 1) {
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
- f_name_to(fuzzy_file, fnamecmpbuf);
+ f_name(fuzzy_file, fnamecmpbuf);
if (verbose > 2) {
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
- safe_fname(fname), safe_fname(fnamecmpbuf));
+ fname, fnamecmpbuf);
}
- st.st_mode = fuzzy_file->mode;
- st.st_size = fuzzy_file->length;
- st.st_mtime = fuzzy_file->modtime;
+ st.st_size = F_LENGTH(fuzzy_file);
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
+#endif
if (stat_errno == ENOENT)
goto notify_others;
- if (verbose > 1) {
- rsyserr(FERROR, stat_errno,
- "recv_generator: failed to stat %s",
- full_fname(fname));
- }
- return;
- }
-
- if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) {
- if (verbose > 1)
- rprintf(FINFO, "%s exists\n", safe_fname(fname));
+ rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+ full_fname(fname));
return;
}
- if (update_only && fnamecmp_type == FNAMECMP_FNAME
- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
- if (verbose > 1)
- rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+ if (append_mode && st.st_size > F_LENGTH(file))
return;
- }
- if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
+ if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
else if (unchanged_file(fnamecmp, file, &st)) {
- if (itemizing) {
- itemize(file, statret, &st,
- fnamecmp_type == FNAMECMP_FNAME
- ? 0 : SID_NO_DEST_AND_NO_UPDATE,
- f_out, ndx);
- }
- if (fnamecmp_type == FNAMECMP_FNAME)
- set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ if (partialptr) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
+ }
+ if (itemizing)
+ itemize(file, ndx, statret, &st, 0, 0, NULL);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
+ if (remove_source_files != 1)
+ return;
+ return_with_success:
+ if (!dry_run)
+ send_msg_int(MSG_SUCCESS, ndx);
return;
}
-prepare_to_open:
+ prepare_to_open:
if (partialptr) {
st = partial_st;
fnamecmp = partialptr;
statret = 0;
}
- if (dry_run || read_batch)
+ if (!do_xfers || read_batch || whole_file)
goto notify_others;
- if (whole_file > 0) {
- if (statret == 0)
- statret = 1;
- goto notify_others;
- }
- if (fuzzy_basis) {
+ if (fuzzy_dirlist) {
int j = flist_find(fuzzy_dirlist, file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
- fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
+ fuzzy_dirlist->files[j]->flags |= FLAG_SENT;
}
/* open the file */
if (fd == -1) {
rsyserr(FERROR, errno, "failed to open %s, continuing",
full_fname(fnamecmp));
- pretend_missing:
+ pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
- statret = -1;
+#endif
+ statret = real_ret = -1;
goto notify_others;
}
- if (inplace && make_backups) {
+ if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
+ if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
if (robust_unlink(backupptr) && errno != ENOENT) {
rsyserr(FERROR, errno, "unlink %s",
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
return;
}
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
rsyserr(FERROR, errno, "open %s",
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
return;
}
if (verbose > 3) {
rprintf(FINFO, "gen mapped %s of size %.0f\n",
- safe_fname(fnamecmp), (double)st.st_size);
+ fnamecmp, (double)st.st_size);
}
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", ndx);
-notify_others:
+ notify_others:
+ if (remove_source_files && !delay_updates && !phase)
+ increment_active_files(ndx, itemizing, code);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ file->flags |= FLAG_SENT;
+#endif
write_int(f_out, ndx);
if (itemizing) {
- int iflags = SID_UPDATING;
+ int iflags = ITEM_TRANSFER;
if (always_checksum)
- iflags |= SID_REPORT_CHECKSUM;
- if (inplace && fnamecmp_type != FNAMECMP_FNAME)
- iflags |= SID_USING_ALT_BASIS;
- itemize(file, statret, &st, iflags, f_out, -1);
- }
- if (f_out_name >= 0) {
- write_byte(f_out_name, fnamecmp_type);
- if (fnamecmp_type == FNAMECMP_FUZZY) {
- uchar lenbuf[3], *lb = lenbuf;
- int len = strlen(fuzzy_file->basename);
- if (len > 0x7F) {
-#if MAXPATHLEN > 0x7FFF
- *lb++ = len / 0x10000 + 0x80;
- *lb++ = len / 0x100;
-#else
- *lb++ = len / 0x100 + 0x80;
+ iflags |= ITEM_REPORT_CHECKSUM;
+ if (fnamecmp_type != FNAMECMP_FNAME)
+ iflags |= ITEM_BASIS_TYPE_FOLLOWS;
+ if (fnamecmp_type == FNAMECMP_FUZZY)
+ iflags |= ITEM_XNAME_FOLLOWS;
+ itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
+ fuzzy_file ? fuzzy_file->basename : NULL);
+ }
+
+ if (!do_xfers) {
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
#endif
- }
- *lb = len;
- write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
- write_buf(f_out_name, fuzzy_file->basename, len);
- }
+ return;
}
+ if (read_batch)
+ return;
- if (dry_run || read_batch)
+ if (statret != 0 || whole_file) {
+ write_sum_head(f_out, NULL);
return;
+ }
- if (statret == 0) {
- generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+ generate_and_send_sums(fd, st.st_size, f_out, f_copy);
- if (f_copy >= 0) {
- close(f_copy);
- set_perms(backupptr, back_file, NULL, 0);
- if (verbose > 1) {
- rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname), safe_fname(backupptr));
- }
- free(back_file);
+ if (f_copy >= 0) {
+ close(f_copy);
+ set_file_attrs(backupptr, back_file, NULL, 0);
+ if (verbose > 1) {
+ rprintf(FINFO, "backed up %s to %s\n",
+ fname, backupptr);
}
+ unmake_file(back_file);
+ }
- close(fd);
- } else
- write_sum_head(f_out, NULL);
+ close(fd);
}
-
-void generate_files(int f_out, struct file_list *flist, char *local_name,
- int f_out_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
- int phase = 0;
char fbuf[MAXPATHLEN];
+ int itemizing;
+ enum logcode code;
+ int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
int need_retouch_dir_perms = 0;
- int save_only_existing = only_existing;
- int save_opt_ignore_existing = opt_ignore_existing;
+ int save_ignore_existing = ignore_existing;
+ int save_ignore_non_existing = ignore_non_existing;
+ int save_do_progress = do_progress;
+ int save_make_backups = make_backups;
+ int dir_tweaking = !(list_only || local_name || dry_run);
+
+ if (protocol_version >= 29) {
+ itemizing = 1;
+ maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
+ code = logfile_format_has_i ? FNONE : FLOG;
+ } else if (am_daemon) {
+ itemizing = logfile_format_has_i && do_xfers;
+ maybe_ATTRS_REPORT = ATTRS_REPORT;
+ code = itemizing || !do_xfers ? FCLIENT : FINFO;
+ } else if (!am_server) {
+ itemizing = stdout_format_has_i;
+ maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
+ code = itemizing ? FNONE : FINFO;
+ } else {
+ itemizing = 0;
+ maybe_ATTRS_REPORT = ATTRS_REPORT;
+ code = FINFO;
+ }
+ solo_file = local_name != NULL;
if (verbose > 2) {
rprintf(FINFO, "generator starting pid=%ld count=%d\n",
(long)getpid(), flist->count);
}
+ if (delete_before && !local_name && flist->count > 0)
+ do_delete_pass(flist);
+ if (delete_during == 2) {
+ deldelay_size = BIGPATHBUFLEN * 4;
+ deldelay_buf = new_array(char, deldelay_size);
+ if (!deldelay_buf)
+ out_of_memory("delete-delay");
+ }
+ do_progress = 0;
+
+ if (append_mode || whole_file < 0)
+ whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
- whole_file > 0
+ whole_file
? "disabled for local transfer or --whole-file"
: "enabled");
}
- /* We expect to just sit around now, so don't exit on a timeout.
- * If we really get a timeout then the other process should exit. */
- io_timeout = 0;
+ /* Since we often fill up the outgoing socket and then just sit around
+ * waiting for the other 2 processes to do their thing, we don't want
+ * to exit on a timeout. If the data stops flowing, the receiver will
+ * notice that and let us know via the redo pipe (or its closing). */
+ ignore_timeout = 1;
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
- struct file_struct copy;
- if (!file->basename)
+ if (!F_IS_ACTIVE(file))
continue;
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name(file, fbuf);
+ recv_generator(fbuf, file, i, itemizing, code, f_out);
+
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
* them. This is then fixed after the transfer is done. */
- if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
- copy = *file;
- copy.mode |= S_IWUSR; /* user write */
- file = ©
+#ifdef HAVE_CHMOD
+ if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
+ && dir_tweaking) {
+ mode_t mode = file->mode | S_IWUSR; /* user write */
+ char *fname = local_name ? local_name : fbuf;
+ if (do_chmod(fname, mode) < 0) {
+ rsyserr(FERROR, errno,
+ "failed to modify permissions on %s",
+ full_fname(fname));
+ }
need_retouch_dir_perms = 1;
}
+#endif
+
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links)
+ check_for_finished_hlinks(itemizing, code);
+#endif
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, f_out, f_out_name);
+ if (allowed_lull && !(i % lull_mod))
+ maybe_send_keepalive();
+ else if (!(i % 200))
+ maybe_flush_socket();
}
- recv_generator(NULL, NULL, NULL, 0, -1, -1);
+ recv_generator(NULL, NULL, 0, 0, code, -1);
if (delete_during)
- delete_in_dir(NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
csum_length = SUM_LENGTH;
- only_existing = max_size = opt_ignore_existing = 0;
+ max_size = min_size = ignore_existing = ignore_non_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
+ if (append_mode) /* resend w/o append mode */
+ append_mode = -1; /* ... but only longer files */
+ make_backups = 0; /* avoid a duplicate backup for inplace processing */
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* files can cycle through the system more than once
* to catch initial checksum errors */
- while ((i = get_redo_num()) != -1) {
+ while ((i = get_redo_num(itemizing, code)) != -1) {
struct file_struct *file = flist->files[i];
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, f_out, f_out_name);
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name(file, fbuf);
+ recv_generator(fbuf, file, i, itemizing, code, f_out);
}
phase++;
- only_existing = save_only_existing;
- opt_ignore_existing = save_opt_ignore_existing;
+ ignore_non_existing = save_ignore_non_existing;
+ ignore_existing = save_ignore_existing;
+ make_backups = save_make_backups;
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
+ /* Reduce round-trip lag-time for a useless delay-updates phase. */
+ if (protocol_version >= 29 && !delay_updates)
+ write_int(f_out, NDX_DONE);
- /* Read post-redo-phase MSG_DONE and any prior messages. */
- get_redo_num();
+ /* Read MSG_DONE for the redo phase (and any prior messages). */
+ get_redo_num(itemizing, code);
+
+ if (protocol_version >= 29) {
+ phase++;
+ if (verbose > 2)
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
+ if (delay_updates)
+ write_int(f_out, NDX_DONE);
+ /* Read MSG_DONE for delay-updates phase & prior messages. */
+ get_redo_num(itemizing, code);
+ }
- if (preserve_hard_links)
- do_hard_links();
+ do_progress = save_do_progress;
+ if (delete_during == 2)
+ do_delayed_deletions(fbuf);
+ if (delete_after && !local_name && flist->count > 0)
+ do_delete_pass(flist);
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && !list_only && !local_name && !dry_run) {
+ if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
+ int j = 0;
/* Now we need to fix any directory permissions that were
* modified during the transfer and/or re-set any tweaked
* modified-time values. */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
- if (!file->basename || !S_ISDIR(file->mode))
+ if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode))
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
- recv_generator(local_name ? local_name : f_name(file),
- flist, file, i, -1, -1);
+ if (file->flags & FLAG_MISSING_DIR) {
+ int missing = file->dir.depth;
+ while (++i < flist->count) {
+ file = flist->files[i];
+ if (file->dir.depth <= missing)
+ break;
+ }
+ i--;
+ continue;
+ }
+ recv_generator(f_name(file, NULL), file, i, itemizing,
+ code, -1);
+ if (allowed_lull && !(++j % lull_mod))
+ maybe_send_keepalive();
+ else if (!(j % 200))
+ maybe_flush_socket();
}
}
- recv_generator(NULL, NULL, NULL, 0, -1, -1);
+ recv_generator(NULL, NULL, 0, 0, code, -1);
+
+ if (max_delete >= 0 && deletion_count > max_delete) {
+ rprintf(FINFO,
+ "Deletions stopped due to --max-delete limit (%d skipped)\n",
+ deletion_count - max_delete);
+ io_error |= IOERR_DEL_LIMIT;
+ }
if (verbose > 2)
- rprintf(FINFO,"generate_files finished\n");
+ rprintf(FINFO, "generate_files finished\n");
}