Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Only do read-/write-batch processing if we're not the server (needed
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
98313e3
..
1d662b4
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-291,6
+291,8
@@
static void do_delete_pass(struct file_list *flist)
delete_in_dir(flist, fbuf, file);
}
delete_in_dir(flist, fbuf, file);
}
+ if (do_progress && !am_server)
+ rprintf(FINFO, " \r");
}
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
}
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
@@
-1130,6
+1132,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
int save_do_progress = do_progress;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_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;
allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
lull_mod = allowed_lull * 5;
@@
-1203,6
+1206,8
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
+ else if (!(i % 200))
+ maybe_flush_socket();
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
@@
-1236,6
+1241,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
phase++;
only_existing = save_only_existing;
opt_ignore_existing = save_opt_ignore_existing;
phase++;
only_existing = save_only_existing;
opt_ignore_existing = save_opt_ignore_existing;
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
@@
-1276,8
+1282,10
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
continue;
recv_generator(f_name(file), file, i, itemizing,
maybe_PERMS_REPORT, code, -1);
continue;
recv_generator(f_name(file), file, i, itemizing,
maybe_PERMS_REPORT, code, -1);
- if (allowed_lull && !(
j++
% lull_mod))
+ if (allowed_lull && !(
++j
% lull_mod))
maybe_send_keepalive();
maybe_send_keepalive();
+ else if (!(j % 200))
+ maybe_flush_socket();
}
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
}
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);