extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
-extern int io_timeout;
extern int io_error;
+extern int allowed_lull;
extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-int allowed_lull = 0;
-
static int deletion_count = 0; /* used to implement --max-delete */
deletion_count--;
return 0;
}
- if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
+ if (!zap_dir) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
continue;
f_name_to(fp, buf);
- if (delete_item(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
- flist_free(dirlist);
- return -1;
- }
+ delete_item(buf, fp->mode, flags & ~DEL_TERSE);
}
flist_free(dirlist);
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- } else if (errno != ENOTEMPTY && errno != ENOENT) {
+ } else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
- if (one_file_system && file->flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
+ if (one_file_system) {
+ if (file->flags & FLAG_TOP_DIR)
+ filesystem_dev = st.st_dev;
+ else if (filesystem_dev != st.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--; ) {
- if (!dirlist->files[i]->basename)
+ struct file_struct *fp = dirlist->files[i];
+ if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
- if (flist_find(flist, dirlist->files[i]) < 0) {
- int mode = dirlist->files[i]->mode;
- f_name_to(dirlist->files[i], delbuf);
- if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
- break;
+ if (flist_find(flist, fp) < 0) {
+ int mode = fp->mode;
+ f_name_to(fp, delbuf);
+ delete_item(delbuf, mode, DEL_FORCE_RECURSE);
}
}
char fbuf[MAXPATHLEN];
int j;
- if (dry_run > 1) /* destination doesn't exist yet */
+ if (dry_run > 1 /* destination doesn't exist yet */
+ || list_only)
return;
for (j = 0; j < flist->count; j++) {
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
- if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time)
- || (keep_time && file->modtime != st->st_mtime))
+ 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 != st->st_mode)
+ 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;
name = fp->basename;
if (fp->length == file->length
- && fp->modtime == file->modtime) {
+ && cmp_modtime(fp->modtime, file->modtime) == 0) {
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
itemize(file, ndx, statret, &st,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
- if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
+ if (statret != 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) {
+ || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
return;
}
- if (max_size && file->length > max_size) {
- if (verbose > 1) {
- if (the_file_list->count == 1)
- fname = f_name(file);
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
- }
- return;
- }
-
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
safe_fname(fname),
(int)file->mode, (int)file->u.rdev);
}
- if (do_mknod(fname,file->mode,file->u.rdev) != 0) {
+ if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
return;
}
- if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
return;
}
+ if (max_size && file->length > max_size) {
+ if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
+ rprintf(FINFO, "%s is over max-size\n",
+ safe_fname(fname));
+ }
+ return;
+ }
+
if (opt_ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
- code) == 0)
+ code) == 0) {
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
return;
- if (verbose) {
- rsyserr(FINFO, errno, "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
}
match_level = 2;
}
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
statret = real_ret = -1;
goto notify_others;
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
- int i, lull_mod;
+ int i;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
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_do_progress = do_progress;
int save_make_backups = make_backups;
- allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
- lull_mod = allowed_lull * 5;
-
if (protocol_version >= 29) {
itemizing = 1;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
: "enabled");
}
- if (protocol_version < 29)
- ignore_timeout = 1;
+ /* 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];
/* 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. */
+#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
int mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
- if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
+ if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
"failed to modify permissions on %s",
full_fname(fname));
}
need_retouch_dir_perms = 1;
}
+#endif
if (preserve_hard_links)
check_for_finished_hlinks(itemizing, code);
ignore_times = 1;
make_backups = 0; /* avoid a duplicate backup for inplace processing */
- /* 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. */
- ignore_timeout = 1;
-
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff