extern int remove_sent_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 ignore_times;
extern int size_only;
extern OFF_T max_size;
+extern OFF_T min_size;
extern int io_error;
extern int allowed_lull;
extern int sock_f_out;
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 whole_file;
extern int list_only;
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 struct filter_list_struct server_filter_list;
static int deletion_count = 0; /* used to implement --max-delete */
+static int can_link_symlinks = 1; /* start out optimistic */
+static int can_link_devices = 1;
+
+/* For calling delete_file() */
+#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
+#define DEL_TERSE (1<<3)
static int is_backup_file(char *fn)
/* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if
- * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE
- * is not set in the flags. */
+ * force_delete is set, this will delete recursively.
+ *
+ * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
+ * a directory! (The buffer is used for recursion, but returned unchanged.)
+ */
static int delete_item(char *fname, int mode, int flags)
{
struct file_list *dirlist;
- char buf[MAXPATHLEN];
int j, dlen, zap_dir, ok;
+ unsigned remainder;
void *save_filters;
+ char *p;
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return -1;
}
- zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
- && !(flags & DEL_NO_RECURSE);
+ zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse);
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;
flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
deletion_count--;
- dlen = strlcpy(buf, fname, MAXPATHLEN);
- save_filters = push_local_filters(buf, dlen);
+ dlen = strlen(fname);
+ save_filters = push_local_filters(fname, dlen);
+
+ dirlist = get_dirlist(fname, dlen, 0);
+
+ p = fname + dlen;
+ if (dlen != 1 || *fname != '/')
+ *p++ = '/';
+ remainder = MAXPATHLEN - (p - fname);
- dirlist = get_dirlist(buf, dlen, 0);
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
if (fp->flags & FLAG_MOUNT_POINT)
continue;
- f_name_to(fp, buf);
- delete_item(buf, fp->mode, flags & ~DEL_TERSE);
+ strlcpy(p, fp->basename, remainder);
+ delete_item(fname, fp->mode, flags & ~DEL_TERSE);
}
flist_free(dirlist);
+ fname[dlen] = '\0';
+
pop_local_filters(save_filters);
if (max_delete && ++deletion_count > max_delete)
}
if (verbose > 2)
- rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf));
+ rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (allowed_lull)
maybe_send_keepalive();
f_name_to(file, fbuf);
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
- rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
+ rprintf(FINFO, "deleting in %s\n", fbuf);
delete_in_dir(flist, fbuf, file);
}
+ delete_in_dir(NULL, NULL, NULL);
+
if (do_progress && !am_server)
rprintf(FINFO, " \r");
}
-static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
if (preserve_perms
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 1;
}
-
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
int32 iflags, uchar fnamecmp_type, char *xname)
{
- if (statret == 0) {
+ 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) && file->length != st->st_size)
iflags |= ITEM_REPORT_SIZE;
- if (!(iflags & ITEM_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_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
- && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
- iflags |= ITEM_REPORT_TIME;
- if (preserve_perms
- && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
- 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 ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
+ iflags |= ITEM_REPORT_TIME;
+ if (preserve_perms
+ && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ 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;
} else
iflags |= ITEM_IS_NEW;
/* 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)
return 0;
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, file->u.sum, checksum_len) == 0;
}
if (size_only)
}
}
+/* 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,
+ int maybe_PERMS_REPORT, 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 || ignore_times)
+ && cmp_modtime(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)
+ match_level = 0;
+ }
+
+#ifdef HAVE_LINK
+ if (match_level == 3 && !copy_dest) {
+ if (link_dest) {
+ if (hard_link_one(file, ndx, fname, 0, stp,
+ cmpbuf, 1,
+ itemizing && verbose > 1,
+ code) < 0)
+ goto try_a_copy;
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ } else if (itemizing)
+ itemize(file, ndx, 0, stp, 0, 0, NULL);
+ if (verbose > 1 && maybe_PERMS_REPORT) {
+ code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
+ rprintf(code, "%s is uptodate\n", fname);
+ }
+ return -2;
+ }
+#endif
+
+ if (match_level >= 2) {
+ try_a_copy: /* Copy the file locally. */
+ 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_perms(fname, file, NULL, 0);
+ if (maybe_PERMS_REPORT
+ && ((!itemizing && verbose && match_level == 2)
+ || (verbose > 1 && match_level == 3))) {
+ code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
+ rprintf(code, "%s%s\n", fname,
+ match_level == 3 ? " is uptodate" : "");
+ }
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ 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. */
+static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+ int itemizing, int *possible_ptr,
+ int maybe_PERMS_REPORT, enum logcode code)
+{
+ char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
+ STRUCT_STAT st;
+ int len, i = 0;
+
+ do {
+ pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname);
+ if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
+ || !unchanged_attrs(file, &st))
+ continue;
+ if (S_ISLNK(file->mode)) {
+ if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
+ continue;
+ lnk[len] = '\0';
+ if (strcmp(lnk, file->u.link) != 0)
+ continue;
+ } else {
+ if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+ continue;
+ }
+ if (link_dest) {
+ if (do_link(fnamebuf, fname) < 0) {
+ /* TODO improve this to be based on errno? */
+ *possible_ptr = 0;
+ break;
+ }
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ }
+ if (itemizing && log_format_has_i && verbose > 1) {
+ int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
+ char *lp = link_dest ? "" : NULL;
+ itemize(file, ndx, 0, &st, changes, 0, lp);
+ }
+ if (verbose > 1 && maybe_PERMS_REPORT) {
+ code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
+ rprintf(code, "%s is uptodate\n", fname);
+ }
+ return -2;
+ } while (basis_dir[++i] != NULL);
+
+ return -1;
+}
+
static int phase = 0;
/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
* 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_struct *file, int ndx,
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;
}
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 %s \"%s\"\n",
S_ISDIR(file->mode) ? "directory" : "file",
- safe_fname(fname));
+ fname);
}
return;
}
}
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
- rprintf(code, "%s/\n", safe_fname(fname));
+ rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
delete_in_dir(the_file_list, fname, file);
fname = f_name(file);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname),
- safe_fname(file->u.link));
+ full_fname(fname), file->u.link);
}
return;
}
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
+ } else if (basis_dir[0] != NULL && can_link_symlinks) {
+ if (try_dests_non(file, fname, ndx, itemizing,
+ &can_link_symlinks,
+ maybe_PERMS_REPORT, code) == -2) {
+ if (!copy_dest)
+ return;
+ itemizing = code = 0;
+ }
}
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
return;
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname), safe_fname(file->u.link));
+ full_fname(fname), file->u.link);
} else {
set_perms(fname,file,NULL,0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
- rprintf(code, "%s -> %s\n", safe_fname(fname),
- safe_fname(file->u.link));
+ rprintf(code, "%s -> %s\n", fname,
+ file->u.link);
}
if (remove_sent_files && !dry_run) {
char numbuf[4];
}
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
+ if (statret != 0
+ && (basis_dir[0] != NULL && can_link_devices)) {
+ if (try_dests_non(file, fname, ndx, itemizing,
+ &can_link_devices,
+ maybe_PERMS_REPORT, code) == -2) {
+ if (!copy_dest)
+ return;
+ itemizing = code = 0;
+ }
+ }
if (statret != 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ if (statret == 0
+ && delete_item(fname, st.st_mode, DEL_TERSE) < 0)
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- safe_fname(fname),
+ fname,
(int)file->mode, (int)file->u.rdev);
}
if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose) {
- rprintf(code, "%s\n",
- safe_fname(fname));
- }
+ if (code && verbose)
+ rprintf(code, "%s\n", fname);
if (preserve_hard_links && file->link_u.links) {
hard_link_cluster(file, ndx,
itemizing, code);
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
fname = f_name(file);
- rprintf(FINFO, "skipping non-regular file \"%s\"\n",
- safe_fname(fname));
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
}
if (verbose > 1) {
if (the_file_list->count == 1)
fname = f_name(file);
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
+ rprintf(FINFO, "%s is over max-size\n", fname);
+ }
+ return;
+ }
+ if (min_size && file->length < min_size) {
+ if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
+ rprintf(FINFO, "%s is under min-size\n", fname);
}
return;
}
- if (opt_ignore_existing && statret == 0) {
+ if (ignore_existing && statret == 0) {
if (verbose > 1)
- rprintf(FINFO, "%s exists\n", safe_fname(fname));
+ rprintf(FINFO, "%s exists\n", fname);
return;
}
if (update_only && statret == 0
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+ rprintf(FINFO, "%s is newer\n", fname);
return;
}
}
if (statret != 0 && basis_dir[0] != NULL) {
- int best_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))
- continue;
- switch (match_level) {
- case 0:
- best_match = i;
- match_level = 1;
- /* FALL THROUGH */
- case 1:
- if (!unchanged_file(fnamecmpbuf, file, &st))
- continue;
- best_match = i;
- match_level = 2;
- if (copy_dest)
- break;
- /* FALL THROUGH */
- case 2:
- if (!unchanged_attrs(file, &st))
- continue;
- best_match = i;
- match_level = 3;
- break;
- }
- break;
- } while (basis_dir[++i] != NULL);
- if (match_level) {
+ int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, maybe_PERMS_REPORT, code);
+ if (j == -2)
+ return;
+ if (j != -1) {
+ fnamecmp = fnamecmpbuf;
+ fnamecmp_type = j;
statret = 0;
- if (i != best_match) {
- i = best_match;
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- basis_dir[i], fname);
- if (link_stat(fnamecmpbuf, &st, 0) < 0) {
- match_level = 0;
- statret = -1;
- stat_errno = errno;
- }
- }
-#ifdef HAVE_LINK
- if (link_dest && match_level == 3) {
- if (hard_link_one(file, ndx, fname, -1, &st,
- fnamecmpbuf, 1,
- itemizing && verbose > 1,
- code) == 0) {
- if (preserve_hard_links
- && file->link_u.links) {
- hard_link_cluster(file, ndx,
- itemizing,
- code);
- }
- return;
- }
- match_level = 2;
- }
-#endif
- if (match_level == 2) {
- /* Copy the file locally. */
- if (copy_file(fnamecmpbuf, fname, file->mode) < 0) {
- if (verbose) {
- rsyserr(FINFO, errno,
- "copy_file %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
- }
- match_level = 0;
- statret = -1;
- } else {
- if (itemizing) {
- itemize(file, ndx, 0, &st,
- ITEM_LOCAL_CHANGE, 0,
- NULL);
- } else if (verbose && code) {
- rprintf(code, "%s\n",
- safe_fname(fname));
- }
- set_perms(fname, file, NULL,
- maybe_PERMS_REPORT);
- if (preserve_hard_links
- && file->link_u.links) {
- hard_link_cluster(file, ndx,
- itemizing,
- code);
- }
- return;
- }
- } else if (compare_dest || match_level == 1) {
- fnamecmp = fnamecmpbuf;
- fnamecmp_type = i;
- }
}
}
f_name_to(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_size = fuzzy_file->length;
statret = 0;
return;
if (stat_errno == ENOENT)
goto notify_others;
- if (verbose > 1) {
- rsyserr(FERROR, stat_errno,
- "recv_generator: failed to stat %s",
- full_fname(fname));
- }
+ rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+ full_fname(fname));
return;
}
if (append_mode && st.st_size > file->length)
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 (fnamecmp_type == FNAMECMP_FNAME) {
- if (itemizing) {
- itemize(file, ndx, real_ret, &real_st,
- 0, 0, NULL);
- }
- set_perms(fname, file, &st, maybe_PERMS_REPORT);
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
- return;
+ if (partialptr) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
}
- /* Only --compare-dest gets here. */
- itemize(file, ndx, real_ret, &real_st,
- ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
+ if (itemizing) {
+ itemize(file, ndx, real_ret, &real_st,
+ 0, 0, NULL);
+ }
+ set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
return;
}
-prepare_to_open:
+ prepare_to_open:
if (partialptr) {
st = partial_st;
fnamecmp = partialptr;
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 && file->link_u.links
&& hard_link_check(file, ndx, fname, statret, &st,
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:
write_int(f_out, ndx);
if (itemizing) {
int iflags = ITEM_TRANSFER;
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname), safe_fname(backupptr));
+ fname, backupptr);
}
free(back_file);
}
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;
if (!file->basename)
continue;
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out);
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name_to(file, fbuf);
+ recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
+ code, f_out);
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
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 */
* to catch initial checksum errors */
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),
- file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out);
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name_to(file, fbuf);
+ recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
+ 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)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff