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
Preparing for release of 2.6.7pre3
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
f8ec71b
..
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;
@@
-81,7
+80,6
@@
extern int link_dest;
extern int whole_file;
extern int list_only;
extern int read_batch;
extern int whole_file;
extern int list_only;
extern int read_batch;
-extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int max_delete;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int max_delete;
@@
-773,6
+771,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
static int missing_below = -1, excluded_below = -1;
static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
static int missing_below = -1, excluded_below = -1;
static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
+ static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
STRUCT_STAT st, real_st, partial_st;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
STRUCT_STAT st, real_st, partial_st;
@@
-832,8
+831,9
@@
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
- && create_directory_path(fname, orig_umask) < 0) {
+ if (relative_paths && !implied_dirs
+ && do_stat(dn, &st) < 0
+ && create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
@@
-843,10
+843,15
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
-
fuzzy_dirlist = get_dirlist(dn, -1, 1)
;
+
need_fuzzy_dirlist = 1
;
}
parent_dirname = dn;
}
parent_dirname = dn;
+ if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+ fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ need_fuzzy_dirlist = 0;
+ }
+
statret = link_stat(fname, &st,
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
statret = link_stat(fname, &st,
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
@@
-890,7
+895,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname
, orig_umask
) < 0
+ || create_directory_path(fname) < 0
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",