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
Got the order of s1 and s2 right in the debug output.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
c5facb7
..
226f44e
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-27,7
+27,6
@@
extern int verbose;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
-extern int log_format_has_o_or_i;
extern int daemon_log_format_has_i;
extern int am_root;
extern int am_server;
extern int daemon_log_format_has_i;
extern int am_root;
extern int am_server;
@@
-832,7
+831,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else {
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
} else {
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
- if (relative_paths && !implied_dirs && stat(dn, &st) < 0
+ if (relative_paths && !implied_dirs
+ && do_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",