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
Changed the "s" modifier to "w" for a word-splitting merge file.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
bf50791
..
afa6436
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-61,7
+61,7
@@
extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
-extern struct
exclude_list_struct server_exclude
_list;
+extern struct
filter_list_struct server_filter
_list;
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
@@
-254,9
+254,9
@@
static void recv_generator(char *fname, struct file_list *flist,
if (verbose > 2)
rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
if (verbose > 2)
rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
- if (server_
exclude
_list.head
- && check_
exclude(&server_exclude
_list, fname,
-
S_ISDIR(file->mode)) < 0) {
+ if (server_
filter
_list.head
+ && check_
filter(&server_filter
_list, fname,
+ S_ISDIR(file->mode)) < 0) {
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
safe_fname(fname));
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
safe_fname(fname));
@@
-315,7
+315,7
@@
static void recv_generator(char *fname, struct file_list *flist,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
- if (delete_during && f_out != -1
+ if (delete_during && f_out != -1
&& csum_length != SUM_LENGTH
&& (file->flags & FLAG_DEL_START))
delete_in_dir(flist, fname);
return;
&& (file->flags & FLAG_DEL_START))
delete_in_dir(flist, fname);
return;
@@
-547,7
+547,7
@@
prepare_to_open:
close(fd);
return;
}
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_
EXCLUDE
S))) {
+ if (!(back_file = make_file(fname, NULL, NO_
FILTER
S))) {
close(fd);
goto pretend_missing;
}
close(fd);
goto pretend_missing;
}
@@
-651,6
+651,8
@@
void generate_files(int f_out, struct file_list *flist, char *local_name,
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
flist, file, i, f_out, f_out_name);
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
flist, file, i, f_out, f_out_name);
}
+ if (delete_during)
+ delete_in_dir(NULL, NULL);
phase++;
csum_length = SUM_LENGTH;
phase++;
csum_length = SUM_LENGTH;