memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
-- strerror putenv iconv_open locale_charset nl_langinfo \
-+ chflags strerror putenv iconv_open locale_charset nl_langinfo \
- sigaction sigprocmask)
+- strerror putenv iconv_open locale_charset nl_langinfo getxattr \
++ chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+ extattr_get_link sigaction sigprocmask)
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
--- old/flist.c
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
-@@ -340,6 +341,9 @@ static void send_file_entry(int f, struc
+@@ -345,6 +346,9 @@ static void send_file_entry(int f, struc
{
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -388,6 +392,12 @@ static void send_file_entry(int f, struc
+@@ -393,6 +397,12 @@ static void send_file_entry(int f, struc
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
-@@ -505,6 +515,10 @@ static void send_file_entry(int f, struc
+@@ -510,6 +520,10 @@ static void send_file_entry(int f, struc
}
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
-@@ -593,6 +607,9 @@ static struct file_struct *recv_file_ent
+@@ -598,6 +612,9 @@ static struct file_struct *recv_file_ent
{
static int64 modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -725,9 +742,12 @@ static struct file_struct *recv_file_ent
+@@ -730,9 +747,12 @@ static struct file_struct *recv_file_ent
}
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (protocol_version < 30)
-@@ -846,6 +866,10 @@ static struct file_struct *recv_file_ent
+@@ -851,6 +871,10 @@ static struct file_struct *recv_file_ent
OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
}
file->mode = mode;
if (preserve_uid)
F_OWNER(file) = uid;
if (preserve_gid)
-@@ -1159,6 +1183,10 @@ struct file_struct *make_file(const char
+@@ -1164,6 +1188,10 @@ struct file_struct *make_file(const char
OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
}
file->mode = st.st_mode;
/* These flags are used in the live flist data. */
-@@ -403,6 +404,10 @@ enum msgcode {
+@@ -404,6 +405,10 @@ enum msgcode {
#endif
#endif
/* Find a variable that is either exactly 32-bits or longer.
* If some code depends on 32-bit truncation, it will need to
* take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -582,6 +587,7 @@ struct file_struct {
+@@ -583,6 +588,7 @@ struct file_struct {
extern int file_extra_cnt;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
extern int preserve_xattrs;
-@@ -616,6 +622,7 @@ extern int preserve_xattrs;
+@@ -617,6 +623,7 @@ extern int preserve_xattrs;
/* When the associated option is on, all entries will have these present: */
#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum