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
Allow --force to work even if --recurse was not specified.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b7aa8cf
..
97395a7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-144,7
+144,7
@@
static int delete_item(char *fname, int mode, int flags)
return -1;
}
return -1;
}
- zap_dir = flags & DEL_FORCE_RECURSE ||
(force_delete && recurse)
;
+ zap_dir = flags & DEL_FORCE_RECURSE ||
force_delete
;
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;
@@
-277,9
+277,8
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
- int mode = fp->mode;
f_name(fp, delbuf);
f_name(fp, delbuf);
- delete_item(delbuf, mode, DEL_FORCE_RECURSE);
+ delete_item(delbuf,
fp->
mode, DEL_FORCE_RECURSE);
}
}
}
}
@@
-608,7
+607,7
@@
void check_for_finished_hlinks(int itemizing, enum logcode code)
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
- int maybe_
PERM
S_REPORT, enum logcode code)
+ int maybe_
ATTR
S_REPORT, enum logcode code)
{
int best_match = -1;
int match_level = 0;
{
int best_match = -1;
int match_level = 0;
@@
-664,7
+663,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
- if (verbose > 1 && maybe_
PERM
S_REPORT) {
+ if (verbose > 1 && maybe_
ATTR
S_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
@@
-684,8
+683,8
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
}
if (itemizing)
itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
}
if (itemizing)
itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
- set_
perm
s(fname, file, NULL, 0);
- if (maybe_
PERM
S_REPORT
+ set_
file_attr
s(fname, file, NULL, 0);
+ if (maybe_
ATTR
S_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
@@
-705,7
+704,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
int itemizing, int *possible_ptr,
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
int itemizing, int *possible_ptr,
- int maybe_
PERM
S_REPORT, enum logcode code)
+ int maybe_
ATTR
S_REPORT, enum logcode code)
{
char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
STRUCT_STAT st;
{
char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
STRUCT_STAT st;
@@
-743,7
+742,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
char *lp = link_dest ? "" : NULL;
itemize(file, ndx, 0, &st, changes, 0, lp);
}
char *lp = link_dest ? "" : NULL;
itemize(file, ndx, 0, &st, changes, 0, lp);
}
- if (verbose > 1 && maybe_
PERM
S_REPORT) {
+ if (verbose > 1 && maybe_
ATTR
S_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
@@
-767,7
+766,7
@@
static int phase = 0;
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
- int itemizing, int maybe_
PERM
S_REPORT,
+ int itemizing, int maybe_
ATTR
S_REPORT,
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
@@
-781,6
+780,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
+ int del_opts = DEL_TERSE | (delete_after ? DEL_FORCE_RECURSE : 0);
if (list_only)
return;
if (list_only)
return;
@@
-870,7
+870,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (delete_item(fname, st.st_mode,
DEL_TERSE
) < 0)
+ if (delete_item(fname, st.st_mode,
del_opts
) < 0)
return;
statret = -1;
}
return;
statret = -1;
}
@@
-891,7
+891,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
full_fname(fname));
}
}
full_fname(fname));
}
}
- if (set_
perm
s(fname, file, statret ? NULL : &st, 0)
+ if (set_
file_attr
s(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
@@
-932,8
+932,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, 0, &st, 0,
0, NULL);
}
itemize(file, ndx, 0, &st, 0,
0, NULL);
}
- set_
perm
s(fname, file, &st,
-
maybe_PERM
S_REPORT);
+ set_
file_attr
s(fname, file, &st,
+
maybe_ATTR
S_REPORT);
if (preserve_hard_links
&& file->link_u.links) {
hard_link_cluster(file, ndx,
if (preserve_hard_links
&& file->link_u.links) {
hard_link_cluster(file, ndx,
@@
-945,14
+945,14
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (delete_item(fname, st.st_mode,
DEL_TERSE
) < 0)
+ if (delete_item(fname, st.st_mode,
del_opts
) < 0)
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
} else if (basis_dir[0] != NULL && can_link_symlinks) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_symlinks,
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
} else if (basis_dir[0] != NULL && can_link_symlinks) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_symlinks,
- maybe_
PERM
S_REPORT, code) == -2) {
+ maybe_
ATTR
S_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
if (!copy_dest)
return;
itemizing = code = 0;
@@
-966,7
+966,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
- set_
perms(fname,file,NULL,
0);
+ set_
file_attrs(fname, file, NULL,
0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
@@
-993,7
+993,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
&& (basis_dir[0] != NULL && can_link_devices)) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_devices,
&& (basis_dir[0] != NULL && can_link_devices)) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_devices,
- maybe_
PERM
S_REPORT, code) == -2) {
+ maybe_
ATTR
S_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
if (!copy_dest)
return;
itemizing = code = 0;
@@
-1003,7
+1003,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
if (statret == 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
if (statret == 0
- && delete_item(fname, st.st_mode,
DEL_TERSE
) < 0)
+ && delete_item(fname, st.st_mode,
del_opts
) < 0)
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
@@
-1021,7
+1021,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
- set_
perms(fname,file,NULL,
0);
+ set_
file_attrs(fname, file, NULL,
0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
@@
-1036,7
+1036,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
- set_
perms(fname, file, &st, maybe_PERM
S_REPORT);
+ set_
file_attrs(fname, file, &st, maybe_ATTR
S_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
@@
-1084,7
+1084,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_item(fname, st.st_mode,
DEL_TERSE
) != 0)
+ if (delete_item(fname, st.st_mode,
del_opts
) != 0)
return;
statret = -1;
stat_errno = ENOENT;
return;
statret = -1;
stat_errno = ENOENT;
@@
-1092,7
+1092,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_
PERM
S_REPORT, code);
+ itemizing, maybe_
ATTR
S_REPORT, code);
if (j == -2)
return;
if (j != -1) {
if (j == -2)
return;
if (j != -1) {
@@
-1157,7
+1157,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, real_ret, &real_st,
0, 0, NULL);
}
itemize(file, ndx, real_ret, &real_st,
0, 0, NULL);
}
- set_
perms(fname, file, &st, maybe_PERM
S_REPORT);
+ set_
file_attrs(fname, file, &st, maybe_ATTR
S_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
@@
-1262,7
+1262,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (f_copy >= 0) {
close(f_copy);
if (f_copy >= 0) {
close(f_copy);
- set_
perm
s(backupptr, back_file, NULL, 0);
+ set_
file_attr
s(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
@@
-1277,7
+1277,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
char fbuf[MAXPATHLEN];
{
int i;
char fbuf[MAXPATHLEN];
- int itemizing, maybe_
PERM
S_REPORT;
+ int itemizing, maybe_
ATTR
S_REPORT;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
@@
-1289,19
+1289,19
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (protocol_version >= 29) {
itemizing = 1;
if (protocol_version >= 29) {
itemizing = 1;
- maybe_
PERMS_REPORT = log_format_has_i ? 0 : PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = log_format_has_i ? 0 : ATTR
S_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
itemizing = daemon_log_format_has_i && do_xfers;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
itemizing = daemon_log_format_has_i && do_xfers;
- maybe_
PERMS_REPORT = PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = ATTR
S_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
- maybe_
PERMS_REPORT = log_format_has_i ? 0 : PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = log_format_has_i ? 0 : ATTR
S_REPORT;
code = itemizing ? 0 : FINFO;
} else {
itemizing = 0;
code = itemizing ? 0 : FINFO;
} else {
itemizing = 0;
- maybe_
PERMS_REPORT = PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = ATTR
S_REPORT;
code = FINFO;
}
code = FINFO;
}
@@
-1339,7
+1339,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_
PERM
S_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_
ATTR
S_REPORT,
code, f_out);
/* We need to ensure that any dirs we create have writeable
code, f_out);
/* We need to ensure that any dirs we create have writeable
@@
-1348,7
+1348,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
-
in
t mode = file->mode | S_IWUSR; /* user write */
+
mode_
t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
@@
-1393,7
+1393,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_
PERM
S_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_
ATTR
S_REPORT,
code, f_out);
}
code, f_out);
}
@@
-1441,7
+1441,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(f_name(file, NULL), file, i, itemizing,
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(f_name(file, NULL), file, i, itemizing,
- maybe_
PERM
S_REPORT, code, -1);
+ maybe_
ATTR
S_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))