Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e70a47f
)
Fixed failing hunks.
author
Wayne Davison
<wayned@samba.org>
Mon, 21 May 2007 02:20:59 +0000
(
02:20
+0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 21 May 2007 02:20:59 +0000
(
02:20
+0000)
omit-dir-changes.diff
patch
|
blob
|
blame
|
history
diff --git
a/omit-dir-changes.diff
b/omit-dir-changes.diff
index
49fc085
..
bd72e72
100644
(file)
--- a/
omit-dir-changes.diff
+++ b/
omit-dir-changes.diff
@@
-29,14
+29,14
@@
To use this patch, run these commands for a successful build:
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
-- if (preserve_uid && am_root && F_OWNER(file) != sxp->st.st_uid)
+- if (preserve_uid && am_root &&
(uid_t)
F_OWNER(file) != sxp->st.st_uid)
+ if (preserve_uid && am_root && !omit_changes
+ if (preserve_uid && am_root && !omit_changes
-+ && F_OWNER(file) != sxp->st.st_uid)
++ &&
(uid_t)
F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
-- && sxp->st.st_gid != F_GROUP(file))
+- && sxp->st.st_gid !=
(gid_t)
F_GROUP(file))
+ if (preserve_gid && !omit_changes
+ if (preserve_gid && !omit_changes
-+ && !(file->FLAG_SKIP_GROUP) && sxp->st.st_gid != F_GROUP(file))
++ && !(file->FLAG_SKIP_GROUP) && sxp->st.st_gid !=
(gid_t)
F_GROUP(file))
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
@@
-108,12
+108,12
@@
To use this patch, run these commands for a successful build:
updated = 1;
}
updated = 1;
}
-- change_uid = am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file);
-+ change_uid = am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file)
+- change_uid = am_root && preserve_uid && sxp->st.st_uid !=
(uid_t)
F_OWNER(file);
++ change_uid = am_root && preserve_uid && sxp->st.st_uid !=
(uid_t)
F_OWNER(file)
+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
-- && sxp->st.st_gid != F_GROUP(file);
-+ && sxp->st.st_gid != F_GROUP(file)
+- && sxp->st.st_gid !=
(gid_t)
F_GROUP(file);
++ && sxp->st.st_gid !=
(gid_t)
F_GROUP(file)
+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(sxp->st.st_mode))
+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(sxp->st.st_mode))