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
Refer to the old basedir variable as dir.root.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
b88ab8b
..
ed26bb8
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-522,7
+522,7
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
static gid_t gid;
static char lastname[MAXPATHLEN], *lastdir;
static int lastdir_depth, lastdir_len = -1;
static gid_t gid;
static char lastname[MAXPATHLEN], *lastdir;
static int lastdir_depth, lastdir_len = -1;
- static unsigned int del_h
ei
r_name_len = 0;
+ static unsigned int del_h
ie
r_name_len = 0;
static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
@@
-646,11
+646,11
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
if (S_ISDIR(mode)) {
if (flags & XMIT_DEL_START) {
in_del_hier = 1;
if (S_ISDIR(mode)) {
if (flags & XMIT_DEL_START) {
in_del_hier = 1;
- del_h
ei
r_name_len = l1 + l2;
+ del_h
ie
r_name_len = l1 + l2;
file->flags |= FLAG_DEL_START;
} else if (delete_during && in_del_hier) {
file->flags |= FLAG_DEL_START;
} else if (delete_during && in_del_hier) {
- if (!relative_paths || (l1 >= del_h
ei
r_name_len
- && thisname[del_h
ei
r_name_len] == '/'))
+ if (!relative_paths || (l1 >= del_h
ie
r_name_len
+ && thisname[del_h
ie
r_name_len] == '/'))
file->flags |= FLAG_DEL_START;
else
in_del_hier = 0;
file->flags |= FLAG_DEL_START;
else
in_del_hier = 0;
@@
-1690,7
+1690,7
@@
void delete_in_dir(struct file_list *flist, char *fname)
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,
- "IO error encountered - skipping file deletion\n");
+ "IO error encountered -
-
skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */
return;
}
max_delete = -1; /* avoid duplicating the above warning */
return;
}