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
- Define MATCHFLG_SENDER_SIDE and MATCHFLG_RECEIVER_SIDE.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
e58f7b0
..
ad28e83
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-251,8
+251,10
@@
static void recv_generator(char *fname, struct file_list *flist,
if (list_only)
return;
if (list_only)
return;
- if (verbose > 2)
- rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), ndx);
+ if (verbose > 2) {
+ rprintf(FINFO, "recv_generator(%s,%d)\n",
+ safe_fname(fname), ndx);
+ }
if (server_filter_list.head
&& check_filter(&server_filter_list, fname,
if (server_filter_list.head
&& check_filter(&server_filter_list, fname,
@@
-314,14
+316,14
@@
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) {
return;
} else if (max_size && file->length > max_size) {
- if (verbose > 1)
- rprintf(FINFO, "%s is over max-size\n", fname);
+ if (verbose > 1) {
+ rprintf(FINFO, "%s is over max-size\n",
+ safe_fname(fname));
+ }
return;
}
return;
}
@@
-329,8
+331,10
@@
static void recv_generator(char *fname, struct file_list *flist,
#if SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
#if SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
- rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname), file->u.link);
+ rprintf(FINFO,
+ "ignoring unsafe symlink %s -> \"%s\"\n",
+ full_fname(fname),
+ safe_fname(file->u.link));
}
return;
}
}
return;
}
@@
-448,7
+452,7
@@
static void recv_generator(char *fname, struct file_list *flist,
if (verbose) {
rsyserr(FINFO, errno,
"link %s => %s",
if (verbose) {
rsyserr(FINFO, errno,
"link %s => %s",
- f
namecmpbuf
,
+ f
ull_fname(fnamecmpbuf)
,
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
@@
-521,12
+525,12
@@
prepare_to_open:
statret = 0;
}
statret = 0;
}
- if (dry_run || whole_file > 0) {
+ if (dry_run || read_batch)
+ goto notify_others;
+ if (whole_file > 0) {
statret = -1;
goto notify_others;
}
statret = -1;
goto notify_others;
}
- if (read_batch)
- goto notify_others;
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
@@
-595,7
+599,7
@@
notify_others:
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
-
fname, backupptr
);
+
safe_fname(fname), safe_fname(backupptr)
);
}
free(back_file);
}
}
free(back_file);
}
@@
-654,7
+658,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;