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
Block-quote the itemized list in the --stats section so that
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b6abc2c
..
fb79b2d
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,7
+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
struct file_list *need_dirlist = (struct file_list *)""
;
+ 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;
@@
-789,8
+787,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!fname) {
if (fuzzy_dirlist) {
if (!fname) {
if (fuzzy_dirlist) {
- if (fuzzy_dirlist != need_dirlist)
- flist_free(fuzzy_dirlist);
+ flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
}
if (missing_below >= 0) {
fuzzy_dirlist = NULL;
}
if (missing_below >= 0) {
@@
-834,24
+831,26
@@
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));
}
if (fuzzy_dirlist) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
}
if (fuzzy_dirlist) {
- if (fuzzy_dirlist != need_dirlist)
- flist_free(fuzzy_dirlist);
+ flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
-
fuzzy_dirlist = need_dirlist
;
+
need_fuzzy_dirlist = 1
;
}
parent_dirname = dn;
}
parent_dirname = dn;
- if (
fuzzy_dirlist == need_dirlist && S_ISREG(file->mode))
+ if (
need_fuzzy_dirlist && S_ISREG(file->mode)) {
fuzzy_dirlist = get_dirlist(dn, -1, 1);
fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ need_fuzzy_dirlist = 0;
+ }
statret = link_stat(fname, &st,
keep_dirlinks && S_ISDIR(file->mode));
statret = link_stat(fname, &st,
keep_dirlinks && S_ISDIR(file->mode));
@@
-896,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",
@@
-1300,6
+1299,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
+ int dir_tweaking = !(list_only || local_name || dry_run);
if (protocol_version >= 29) {
itemizing = 1;
if (protocol_version >= 29) {
itemizing = 1;
@@
-1361,7
+1361,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
* them. This is then fixed after the transfer is done. */
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
* them. This is then fixed after the transfer is done. */
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
-
&& !list_only
) {
+
&& dir_tweaking
) {
mode_t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
mode_t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
@@
-1441,8
+1441,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && !list_only && !local_name && !dry_run) {
+ if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
int j = 0;
/* Now we need to fix any directory permissions that were
* modified during the transfer and/or re-set any tweaked
int j = 0;
/* Now we need to fix any directory permissions that were
* modified during the transfer and/or re-set any tweaked