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;
* from the filesystem. */
for (i = dirlist->count; i--; ) {
struct file_struct *fp = dirlist->files[i];
- if (!fp->basename)
+ if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
int mode = fp->mode;
f_name_to(fp, delbuf);
- if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
- break;
+ 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)
iflags |= ITEM_REPORT_PERMS;
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",
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));
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;