summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1f1d368)
- Tweaked the order of the args to write_item_attrs().
-static void write_item_attrs(int f_out, int ndx, int iflags, char *buf,
- uchar fnamecmp_type, int len)
+static void write_item_attrs(int f_out, int ndx, int iflags,
+ uchar fnamecmp_type, char *buf, int len)
{
write_int(f_out, ndx);
if (protocol_version < 29)
{
write_int(f_out, ndx);
if (protocol_version < 29)
}
/* This is also used by receive.c with f_out = -1. */
}
/* This is also used by receive.c with f_out = -1. */
-int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
+int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
+ char *buf, int *len_ptr)
{
int len;
uchar fnamecmp_type = FNAMECMP_FNAME;
{
int len;
uchar fnamecmp_type = FNAMECMP_FNAME;
/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
if (protocol_version >= 29 && iflags & ITEM_TRANSFER
/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
if (protocol_version >= 29 && iflags & ITEM_TRANSFER
}
} else if (f_out >= 0) {
write_item_attrs(f_out, ndx, isave /*XXX iflags */,
}
} else if (f_out >= 0) {
write_item_attrs(f_out, ndx, isave /*XXX iflags */,
- buf, fnamecmp_type, len);
+ fnamecmp_type, buf, len);
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
char *fname2, fname[MAXPATHLEN];
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
char *fname2, fname[MAXPATHLEN];
- char fnametmp[MAXPATHLEN];
+ char xname[MAXPATHLEN];
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
- iflags = read_item_attrs(f_in, f_out, i, fnametmp,
- &fnamecmp_type);
+ iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
+ xname, &xlen);
if (iflags == ITEM_IS_NEW) /* no-op packet */
continue;
if (iflags == ITEM_IS_NEW) /* no-op packet */
continue;
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (!(iflags & ITEM_TRANSFER)) {
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (!(iflags & ITEM_TRANSFER)) {
- maybe_log_item(file, iflags, itemizing, fnametmp);
+ maybe_log_item(file, iflags, itemizing, xname);
- if (protocol_version >= 29) {
- updating_basis_file = inplace
- && fnamecmp_type == FNAMECMP_FNAME;
- } else
- updating_basis_file = inplace && !make_backups;
+ updating_basis_file = inplace && (protocol_version >= 29
+ ? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
stats.current_file_index = i;
stats.num_transferred_files++;
stats.current_file_index = i;
stats.num_transferred_files++;
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
- write_item_attrs(f_out, i, iflags, fnametmp,
- fnamecmp_type, -1);
+ write_item_attrs(f_out, i, iflags, fnamecmp_type,
+ xname, xlen);
safe_fname(fname), (double)st.st_size);
}
safe_fname(fname), (double)st.st_size);
}
- write_item_attrs(f_out, i, iflags, fnametmp, fnamecmp_type, -1);
+ write_item_attrs(f_out, i, iflags, fnamecmp_type, xname, xlen);
write_sum_head(f_out, s);
if (verbose > 2) {
write_sum_head(f_out, s);
if (verbose > 2) {