Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8982a89
)
Call delete_in_dir() with its new args.
author
Wayne Davison
<wayned@samba.org>
Thu, 3 Feb 2005 02:01:11 +0000
(
02:01
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 3 Feb 2005 02:01:11 +0000
(
02:01
+0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
e58f7b0
..
bbe70fb
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-314,10
+314,8
@@
static void recv_generator(char *fname, struct file_list *flist,
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
- && (file->flags & FLAG_DEL_START)) {
- delete_in_dir(flist, fname, strlen(fname),
- file->dir.depth);
- }
+ && (file->flags & FLAG_DEL_HERE))
+ delete_in_dir(flist, fname, file);
return;
} else if (max_size && file->length > max_size) {
if (verbose > 1)
return;
} else if (max_size && file->length > max_size) {
if (verbose > 1)
@@
-654,7
+652,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name,
flist, file, i, f_out, f_out_name);
}
if (delete_during)
flist, file, i, f_out, f_out_name);
}
if (delete_during)
- delete_in_dir(NULL, NULL,
0, 0
);
+ delete_in_dir(NULL, NULL,
NULL
);
phase++;
csum_length = SUM_LENGTH;
phase++;
csum_length = SUM_LENGTH;