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 */
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;
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++) {
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)) {
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));
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;