From 761f1b713569c7ea93ba2b53120fa76909a6466e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 21 May 2007 03:17:14 +0000 Subject: [PATCH] Fixed failing hunks. --- atimes.diff | 36 ++++++++++++++++++------------------ usermap.diff | 30 +++++++++++++++--------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/atimes.diff b/atimes.diff index d19782c..3edded1 100644 --- a/atimes.diff +++ b/atimes.diff @@ -55,7 +55,7 @@ TODO: need to fix this to handle 64-bit time_t values! f_name(f, NULL)); } } -@@ -339,6 +343,7 @@ int push_pathname(const char *dir, int l +@@ -344,6 +348,7 @@ int push_pathname(const char *dir, int l static void send_file_entry(int f, struct file_struct *file, int ndx) { static time_t modtime; @@ -63,7 +63,7 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -434,6 +439,13 @@ static void send_file_entry(int f, struc +@@ -439,6 +444,13 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -77,7 +77,7 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -505,6 +517,8 @@ static void send_file_entry(int f, struc +@@ -510,6 +522,8 @@ static void send_file_entry(int f, struc } if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -86,18 +86,18 @@ TODO: need to fix this to handle 64-bit time_t values! if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -591,7 +605,7 @@ static void send_file_entry(int f, struc +@@ -596,7 +610,7 @@ static void send_file_entry(int f, struc static struct file_struct *recv_file_entry(struct file_list *flist, - int flags, int f) + int xflags, int f) { - static int64 modtime; + static int64 modtime, atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -725,6 +739,16 @@ static struct file_struct *recv_file_ent +@@ -731,6 +745,16 @@ static struct file_struct *recv_file_ent } - if (!(flags & XMIT_SAME_MODE)) + if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) { + atime = read_varlong(f, 4); @@ -112,16 +112,16 @@ TODO: need to fix this to handle 64-bit time_t values! if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -850,6 +874,8 @@ static struct file_struct *recv_file_ent - F_OWNER(file) = uid; - if (preserve_gid) +@@ -859,6 +883,8 @@ static struct file_struct *recv_file_ent F_GROUP(file) = gid; + file->flags |= gid_flags; + } + if (preserve_atimes) + F_ATIME(file) = (time_t)atime; #ifdef ICONV_OPTION if (ic_ndx) F_NDX(file) = flist->count + flist->ndx_start; -@@ -1163,6 +1189,8 @@ struct file_struct *make_file(const char +@@ -1172,6 +1198,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; if (preserve_gid) F_GROUP(file) = st.st_gid; @@ -149,7 +149,7 @@ TODO: need to fix this to handle 64-bit time_t values! + iflags |= ITEM_REPORT_ATIME; if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid) + if (preserve_uid && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) @@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str if (link_dest) { if (!hard_link_one(file, fname, cmpbuf, 1)) @@ -286,7 +286,7 @@ TODO: need to fix this to handle 64-bit time_t values! + updated = 0; } - change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file); + change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file); --- old/rsync.h +++ new/rsync.h @@ -56,6 +56,7 @@ @@ -297,7 +297,7 @@ TODO: need to fix this to handle 64-bit time_t values! /* These flags are used in the live flist data. */ -@@ -141,6 +142,7 @@ +@@ -143,6 +144,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -323,7 +323,7 @@ TODO: need to fix this to handle 64-bit time_t values! #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num --- old/rsync.yo +++ new/rsync.yo -@@ -330,8 +330,9 @@ to the detailed description below for a +@@ -336,8 +336,9 @@ to the detailed description below for a --devices preserve device files (super-user only) --specials preserve special files -D same as --devices --specials @@ -335,7 +335,7 @@ TODO: need to fix this to handle 64-bit time_t values! --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently -@@ -910,6 +911,12 @@ it is preserving modification times (see +@@ -916,6 +917,12 @@ it is preserving modification times (see the directories on the receiving side, it is a good idea to use bf(-O). This option is inferred if you use bf(--backup) without bf(--backup-dir). @@ -348,7 +348,7 @@ TODO: need to fix this to handle 64-bit time_t values! dit(bf(--super)) This tells the receiving side to attempt super-user activities even if the receiving rsync wasn't run by the super-user. These activities include: preserving users via the bf(--owner) option, preserving -@@ -1524,7 +1531,7 @@ quote(itemization( +@@ -1530,7 +1537,7 @@ quote(itemization( by the file transfer. it() A bf(t) means the modification time is different and is being updated to the sender's value (requires bf(--times)). An alternate value of bf(T) @@ -357,7 +357,7 @@ TODO: need to fix this to handle 64-bit time_t values! anytime a symlink is transferred, or when a file or device is transferred without bf(--times). it() A bf(p) means the permissions are different and are being updated to -@@ -1533,8 +1540,10 @@ quote(itemization( +@@ -1539,8 +1546,10 @@ quote(itemization( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). diff --git a/usermap.diff b/usermap.diff index 0941ce5..6424c1c 100644 --- a/usermap.diff +++ b/usermap.diff @@ -27,16 +27,16 @@ To use this patch, run these commands for a successful build: uid = match_uid(uid); } } -@@ -753,7 +755,7 @@ static struct file_struct *recv_file_ent - gid = (gid_t)read_varint(f); +@@ -754,7 +756,7 @@ static struct file_struct *recv_file_ent + gid_flags = 0; if (xflags & XMIT_GROUP_NAME_FOLLOWS) - gid = recv_group_name(f, gid, &new_flags); + gid = recv_group_name(f, gid, &gid_flags); - else if (inc_recurse && (!am_root || !numeric_ids)) + else if (inc_recurse && (!am_root || !numeric_ids || groupmap)) - gid = match_gid(gid, &new_flags); + gid = match_gid(gid, &gid_flags); } } -@@ -1882,8 +1884,13 @@ struct file_list *recv_file_list(int f) +@@ -1886,8 +1888,13 @@ struct file_list *recv_file_list(int f) int dstart, flags; int64 start_read; @@ -312,16 +312,16 @@ To use this patch, run these commands for a successful build: } gid_t match_gid(gid_t gid, uint16 *flags_ptr) -@@ -230,7 +234,7 @@ gid_t match_gid(gid_t gid, uint16 *flags +@@ -227,7 +231,7 @@ gid_t match_gid(gid_t gid, uint16 *flags + break; + } + if (!list) +- list = recv_add_gid(gid, flags_ptr); ++ list = recv_add_id(&gidmap, gid, flags_ptr); + last = list; } - if (!list) -- list = recv_add_gid(gid, NULL); -+ list = recv_add_id(&gidmap, gid, NULL); - - if (flags_ptr && list->flags & FLAG_SKIP_GROUP) - *flags_ptr |= FLAG_SKIP_GROUP; -@@ -317,7 +321,7 @@ uid_t recv_user_name(int f, uid_t uid) +@@ -316,7 +320,7 @@ uid_t recv_user_name(int f, uid_t uid) if (!name) out_of_memory("recv_user_name"); read_sbuf(f, name, len); @@ -330,7 +330,7 @@ To use this patch, run these commands for a successful build: return node->id2; } -@@ -329,7 +333,7 @@ gid_t recv_group_name(int f, gid_t gid, +@@ -328,7 +332,7 @@ gid_t recv_group_name(int f, gid_t gid, if (!name) out_of_memory("recv_group_name"); read_sbuf(f, name, len); @@ -339,7 +339,7 @@ To use this patch, run these commands for a successful build: if (flags_ptr && node->flags & FLAG_SKIP_GROUP) *flags_ptr |= FLAG_SKIP_GROUP; return node->id2; -@@ -356,17 +360,96 @@ void recv_id_list(int f, struct file_lis +@@ -355,17 +359,96 @@ void recv_id_list(int f, struct file_lis /* Now convert all the uids/gids from sender values to our values. */ #ifdef SUPPORT_ACLS -- 2.34.1