extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_times;
+extern int omit_dir_times;
+extern int delete_during;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct server_filter_list;
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
}
-/*
- * Acts on file number @p i from @p flist, whose name is @p fname.
- *
- * First fixes up permissions, then generates checksums for the file.
+/* Acts on flist->file's ndx'th item, whose name is fname. If a directory,
+ * 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.
*
- * @note This comment was added later by mbp who was trying to work it
- * out. It might be wrong.
- */
-static void recv_generator(char *fname, struct file_struct *file, int i,
+ * 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 int missing_below = -1;
int fd = -1, f_copy = -1;
STRUCT_STAT st, partial_st;
struct file_struct *back_file = NULL;
if (list_only)
return;
- if (verbose > 2)
- rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
+ if (verbose > 2) {
+ rprintf(FINFO, "recv_generator(%s,%d)\n",
+ safe_fname(fname), ndx);
+ }
- if (server_exclude_list.head
- && check_exclude(&server_exclude_list, fname,
- S_ISDIR(file->mode)) < 0) {
+ if (server_filter_list.head
+ && check_filter(&server_filter_list, fname,
+ S_ISDIR(file->mode)) < 0) {
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
safe_fname(fname));
return;
}
+ if (dry_run && missing_below >= 0 && file->dir.depth <= missing_below) {
+ dry_run--;
+ missing_below = -1;
+ }
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
delete_file(fname, DEL_TERSE);
statret = -1;
}
+ if (dry_run && statret != 0 && missing_below < 0) {
+ missing_below = file->dir.depth;
+ dry_run++;
+ }
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
full_fname(fname));
}
}
- /* f_out is set to -1 when doing final directory-permission
- * and modification-time repair. */
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%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);
return;
} else if (max_size && file->length > max_size) {
- if (verbose > 1)
- rprintf(FINFO, "%s is over max-size\n", fname);
+ if (verbose > 1) {
+ rprintf(FINFO, "%s is over max-size\n",
+ safe_fname(fname));
+ }
return;
}
if (preserve_links && S_ISLNK(file->mode)) {
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
- rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname), file->u.link);
+ rprintf(FINFO,
+ "ignoring unsafe symlink %s -> \"%s\"\n",
+ full_fname(fname),
+ safe_fname(file->u.link));
}
return;
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
basis_dir[i], fname);
}
-#if HAVE_LINK
+#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",
- fnamecmpbuf,
+ full_fname(fnamecmpbuf),
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
statret = 0;
}
- if (dry_run || whole_file > 0) {
+ if (dry_run || read_batch)
+ goto notify_others;
+ if (whole_file > 0) {
statret = -1;
goto notify_others;
}
- if (read_batch)
- goto notify_others;
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) {
+ if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
}
if (verbose > 2)
- rprintf(FINFO, "generating and sending sums for %d\n", i);
+ rprintf(FINFO, "generating and sending sums for %d\n", ndx);
notify_others:
- write_int(f_out, i);
+ write_int(f_out, ndx);
if (protocol_version >= 29 && inplace && !read_batch)
write_byte(f_out, fnamecmp_type);
if (f_out_name >= 0)
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- fname, backupptr);
+ safe_fname(fname), safe_fname(backupptr));
}
free(back_file);
}
int i;
int phase = 0;
char fbuf[MAXPATHLEN];
+ 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;
if (verbose > 2) {
rprintf(FINFO, "generator starting pid=%ld count=%d\n",
: "delta transmission enabled\n");
}
- /* 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 */
+ /* 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;
for (i = 0; i < flist->count; i++) {
if (!file->basename)
continue;
- /* we need to ensure that any directories we create have writeable
- permissions initially so that we can create the files within
- them. This is then fixed after the files are transferred */
+
+ /* 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;
- /* XXX: Could this be causing a problem on SCO? Perhaps their
- * handling of permissions is strange? */
copy.mode |= S_IWUSR; /* user write */
file = ©
+ need_retouch_dir_perms = 1;
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out, f_out_name);
+ flist, file, i, f_out, f_out_name);
}
+ if (delete_during)
+ delete_in_dir(NULL, NULL, NULL);
phase++;
csum_length = SUM_LENGTH;
+ only_existing = max_size = opt_ignore_existing = 0;
+ update_only = always_checksum = size_only = 0;
ignore_times = 1;
if (verbose > 2)
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out, f_out_name);
+ flist, file, i, f_out, f_out_name);
}
phase++;
+ only_existing = save_only_existing;
+ opt_ignore_existing = save_opt_ignore_existing;
+
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
if (preserve_hard_links)
do_hard_links();
- /* now we need to fix any directory permissions that were
- * modified during the transfer */
- for (i = 0; i < flist->count; i++) {
- struct file_struct *file = flist->files[i];
- if (!file->basename || !S_ISDIR(file->mode))
- continue;
- recv_generator(local_name ? local_name : f_name(file),
- file, i, -1, -1);
+ if ((need_retouch_dir_perms || need_retouch_dir_times)
+ && !list_only && !local_name && !dry_run) {
+ /* 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))
+ 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 (verbose > 2)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff