extern int size_only;
extern OFF_T max_size;
extern int io_timeout;
+extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
#define SID_UPDATING ITEM_UPDATING
#define SID_REPORT_CHECKSUM ITEM_REPORT_CHECKSUM
+#define SID_USING_ALT_BASIS ITEM_USING_ALT_BASIS
+/* This flag doesn't get sent, so it must be outside 0xffff. */
#define SID_NO_DEST_AND_NO_UPDATE (1<<16)
static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
int32 sflags, int f_out, int ndx)
{
- int iflags = sflags & (SID_UPDATING | SID_REPORT_CHECKSUM);
+ int iflags = sflags & 0xffff;
if (statret >= 0) {
if (S_ISREG(file->mode) && file->length != st->st_size)
* modification-time repair. */
static void recv_generator(char *fname, struct file_list *flist,
struct file_struct *file, int ndx,
+ int itemizing, int maybe_PERMS_REPORT,
+ enum logcode code,
int f_out, int f_out_name)
{
static int missing_below = -1, excluded_below = -1;
int statret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
- int itemizing, maybe_PERMS_REPORT;
uchar fnamecmp_type;
- enum logcode code;
if (list_only)
return;
- if (protocol_version >= 29) {
- itemizing = 1;
- code = daemon_log_format_has_i ? 0 : FLOG;
- maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
- } else if (am_daemon) {
- itemizing = daemon_log_format_has_i && !dry_run;
- code = itemizing || dry_run ? FCLIENT : FINFO;
- maybe_PERMS_REPORT = PERMS_REPORT;
- } else if (!am_server) {
- itemizing = log_format_has_i;
- code = itemizing ? 0 : FINFO;
- maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
- } else {
- itemizing = 0;
- code = FINFO;
- maybe_PERMS_REPORT = PERMS_REPORT;
- }
-
if (!fname) {
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
notify_others:
write_int(f_out, ndx);
if (itemizing) {
- itemize(file, statret, &st, SID_UPDATING
- | (always_checksum ? SID_REPORT_CHECKSUM : 0),
- f_out, -1);
- if (inplace && !read_batch)
- write_byte(f_out, fnamecmp_type);
+ int iflags = SID_UPDATING;
+ if (always_checksum)
+ iflags |= SID_REPORT_CHECKSUM;
+ if (fnamecmp_type != FNAMECMP_FNAME)
+ iflags |= SID_USING_ALT_BASIS;
+ itemize(file, statret, &st, iflags, f_out, -1);
}
if (f_out_name >= 0) {
write_byte(f_out_name, fnamecmp_type);
#endif
}
*lb = len;
- write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
+ write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
write_buf(f_out_name, fuzzy_file->basename, len);
}
}
int i;
int phase = 0;
char fbuf[MAXPATHLEN];
+ int itemizing, maybe_PERMS_REPORT;
+ enum logcode code;
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;
+ int allowed_lull = io_timeout / 2;
+
+ if (protocol_version >= 29) {
+ itemizing = 1;
+ maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+ code = daemon_log_format_has_i ? 0 : FLOG;
+ } else if (am_daemon) {
+ itemizing = daemon_log_format_has_i && !dry_run;
+ maybe_PERMS_REPORT = PERMS_REPORT;
+ code = itemizing || dry_run ? FCLIENT : FINFO;
+ } else if (!am_server) {
+ itemizing = log_format_has_i;
+ maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+ code = itemizing ? 0 : FINFO;
+ } else {
+ itemizing = 0;
+ maybe_PERMS_REPORT = PERMS_REPORT;
+ code = FINFO;
+ }
if (verbose > 2) {
rprintf(FINFO, "generator starting pid=%ld count=%d\n",
}
if (verbose >= 2) {
- rprintf(FINFO,
+ rprintf(FINFO, "delta-transmission %s\n",
whole_file > 0
- ? "delta-transmission disabled for local transfer or --whole-file\n"
- : "delta transmission enabled\n");
+ ? "disabled for local transfer or --whole-file"
+ : "enabled");
}
- /* 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;
+ if (protocol_version < 29)
+ ignore_timeout = 1;
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, f_out, f_out_name);
+ flist, file, i, itemizing, maybe_PERMS_REPORT,
+ code, f_out, f_out_name);
+
+ if (allowed_lull && !(i % 100))
+ maybe_send_keepalive(allowed_lull, flist->count);
}
- recv_generator(NULL, NULL, NULL, 0, -1, -1);
+ recv_generator(NULL, NULL, NULL, 0, 0, 0, code, -1, -1);
if (delete_during)
delete_in_dir(NULL, NULL, NULL);
update_only = always_checksum = size_only = 0;
ignore_times = 1;
+ /* 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);
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, f_out, f_out_name);
+ flist, file, i, itemizing, maybe_PERMS_REPORT,
+ code, f_out, f_out_name);
+ if (allowed_lull)
+ maybe_send_keepalive(allowed_lull, flist->count);
}
phase++;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(local_name ? local_name : f_name(file),
- flist, file, i, -1, -1);
+ flist, file, i, itemizing,
+ maybe_PERMS_REPORT, code, -1, -1);
}
}
- recv_generator(NULL, NULL, NULL, 0, -1, -1);
+ recv_generator(NULL, NULL, NULL, 0, 0, 0, code, -1, -1);
if (verbose > 2)
rprintf(FINFO,"generate_files finished\n");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff