extern int log_format_has_i;
extern int daemon_log_format_has_i;
extern int csum_length;
+extern int append_mode;
extern int io_error;
extern int allowed_lull;
extern int protocol_version;
(double)s->count, (long)s->blength, (long)s->remainder);
}
+ if (append_mode) {
+ s->flength = (OFF_T)s->count * s->blength;
+ if (s->remainder)
+ s->flength -= s->blength - s->remainder;
+ return s;
+ }
+
if (s->count == 0)
return(s);
file->dir.root, "/", NULL);
} else
offset = 0;
- f_name_to(file, fname + offset);
- if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
- rprintf(FINFO, "sender removed %s\n",
- safe_fname(fname + offset));
- }
+ f_name(file, fname + offset);
+ if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
+ rprintf(FINFO, "sender removed %s\n", fname + offset);
}
static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
+ append_mode = 0;
continue;
}
fname[offset++] = '/';
} else
offset = 0;
- fname2 = f_name_to(file, fname + offset);
+ fname2 = f_name(file, fname + offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- safe_fname(fname), (double)st.st_size);
+ fname, (double)st.st_size);
}
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
write_sum_head(f_xfer, s);
- if (verbose > 2) {
- rprintf(FINFO, "calling match_sums %s\n",
- safe_fname(fname));
- }
+ if (verbose > 2)
+ rprintf(FINFO, "calling match_sums %s\n", fname);
if (log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
- rprintf(FINFO, "%s\n", safe_fname(fname2));
+ rprintf(FINFO, "%s\n", fname2);
set_compression(fname);
free_sums(s);
- if (verbose > 2) {
- rprintf(FINFO, "sender finished %s\n",
- safe_fname(fname));
- }
+ if (verbose > 2)
+ rprintf(FINFO, "sender finished %s\n", fname);
/* Flag that we actually sent this entry. */
file->flags |= FLAG_SENT;