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
Implemented a "!" modifier for filter rules that lets a rule trigger
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
741a8d2
..
1cf4365
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-138,25
+138,31
@@
void send_files(struct file_list *flist, int f_out, int f_in)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
+ if (inplace && protocol_version >= 29) {
+ uchar fnamecmp_type = read_byte(f_in);
+ updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+ } else
+ updating_basis_file = inplace && !make_backups;
+
file = flist->files[i];
file = flist->files[i];
+ if (S_ISDIR(file->mode)) {
+ rprintf(FERROR, "[%s] got index of directory: %d\n",
+ who_am_i(), i);
+ exit_cleanup(RERR_PROTOCOL);
+ }
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
- if (file->
basedir
) {
+ if (file->
dir.root
) {
/* N.B. We're sure that this fits, so offset is OK. */
/* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->
basedir
, sizeof fname);
+ offset = strlcpy(fname, file->
dir.root
, sizeof fname);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else
offset = 0;
fname2 = f_name_to(file, fname + offset);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else
offset = 0;
fname2 = f_name_to(file, fname + offset);
- if (inplace && protocol_version >= 29) {
- uchar fnamecmp_type = read_byte(f_in);
- updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
- } else
- updating_basis_file = inplace && !make_backups;
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);