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
Include popt.h using <popt.h> instead of "popt.h".
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
277750c
..
763d826
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-48,6
+48,7
@@
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
+extern int preserve_specials;
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
@@
-343,16
+344,14
@@
static void send_file_entry(struct file_struct *file, int f)
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
- if (preserve_devices) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode)) {
- if (file->u.rdev == rdev)
- flags |= XMIT_SAME_RDEV_pre28;
- else
- rdev = file->u.rdev;
- } else
- rdev = makedev(0, 0);
- } else if (IS_DEVICE(mode)) {
+ if (file->u.rdev == rdev)
+ flags |= XMIT_SAME_RDEV_pre28;
+ else
+ rdev = file->u.rdev;
+ } else {
rdev = file->u.rdev;
if ((uint32)major(rdev) == rdev_major)
flags |= XMIT_SAME_RDEV_MAJOR;
rdev = file->u.rdev;
if ((uint32)major(rdev) == rdev_major)
flags |= XMIT_SAME_RDEV_MAJOR;
@@
-361,15
+360,16
@@
static void send_file_entry(struct file_struct *file, int f)
if ((uint32)minor(rdev) <= 0xFFu)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
if ((uint32)minor(rdev) <= 0xFFu)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
- }
- if (file->ids->uid == uid)
+ } else if (protocol_version < 28)
+ rdev = makedev(0, 0);
+ if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
flags |= XMIT_SAME_UID;
else
- uid = file->
ids->
uid;
- if (file->
ids->
gid == gid)
+ uid = file->uid;
+ if (file->gid == gid)
flags |= XMIT_SAME_GID;
else
flags |= XMIT_SAME_GID;
else
- gid = file->
ids->
gid;
+ gid = file->gid;
if (file->modtime == modtime)
flags |= XMIT_SAME_TIME;
else
if (file->modtime == modtime)
flags |= XMIT_SAME_TIME;
else
@@
-437,7
+437,8
@@
static void send_file_entry(struct file_struct *file, int f)
add_gid(gid);
write_int(f, gid);
}
add_gid(gid);
write_int(f, gid);
}
- if (preserve_devices && IS_DEVICE(mode)) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
if (!(flags & XMIT_SAME_RDEV_pre28))
write_int(f, (int)rdev);
if (protocol_version < 28) {
if (!(flags & XMIT_SAME_RDEV_pre28))
write_int(f, (int)rdev);
@@
-577,14
+578,12
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (preserve_gid && !(flags & XMIT_SAME_GID))
gid = (gid_t)read_int(f);
if (preserve_gid && !(flags & XMIT_SAME_GID))
gid = (gid_t)read_int(f);
- if (preserve_devices) {
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode)) {
- if (!(flags & XMIT_SAME_RDEV_pre28))
- rdev = (dev_t)read_int(f);
- } else
- rdev = makedev(0, 0);
- } else if (IS_DEVICE(mode)) {
+ if (!(flags & XMIT_SAME_RDEV_pre28))
+ rdev = (dev_t)read_int(f);
+ } else {
uint32 rdev_minor;
if (!(flags & XMIT_SAME_RDEV_MAJOR))
rdev_major = read_int(f);
uint32 rdev_minor;
if (!(flags & XMIT_SAME_RDEV_MAJOR))
rdev_major = read_int(f);
@@
-594,7
+593,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
rdev_minor = read_int(f);
rdev = makedev(rdev_major, rdev_minor);
}
rdev_minor = read_int(f);
rdev = makedev(rdev_major, rdev_minor);
}
- }
+ } else if (protocol_version < 28)
+ rdev = makedev(0, 0);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
@@
-622,7
+622,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
- file->ids = id_pair(uid, gid);
+ file->uid = uid;
+ file->gid = gid;
if (dirname_len) {
file->dirname = lastdir = bp;
if (dirname_len) {
file->dirname = lastdir = bp;
@@
-663,7
+664,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
memcpy(bp, basename, basename_len);
bp += basename_len;
memcpy(bp, basename, basename_len);
bp += basename_len;
- if (preserve_devices && IS_DEVICE(mode))
+ if ((preserve_devices && IS_DEVICE(mode))
+ || (preserve_specials && IS_SPECIAL(mode)))
file->u.rdev = rdev;
#ifdef SUPPORT_LINKS
file->u.rdev = rdev;
#ifdef SUPPORT_LINKS
@@
-878,7
+880,8
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
- file->ids = id_pair(st.st_uid, st.st_gid);
+ file->uid = st.st_uid;
+ file->gid = st.st_gid;
#ifdef SUPPORT_HARD_LINKS
if (flist && flist->hlink_pool) {
#ifdef SUPPORT_HARD_LINKS
if (flist && flist->hlink_pool) {
@@
-914,7
+917,8
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
bp += basename_len;
#ifdef HAVE_STRUCT_STAT_ST_RDEV
bp += basename_len;
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- if (preserve_devices && IS_DEVICE(st.st_mode))
+ if ((preserve_devices && IS_DEVICE(st.st_mode))
+ || (preserve_specials && IS_SPECIAL(st.st_mode)))
file->u.rdev = st.st_rdev;
#endif
file->u.rdev = st.st_rdev;
#endif
@@
-945,7
+949,8
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
- file->ids = id_pair(st2.st_uid, st2.st_gid);
+ file->uid = st2.st_uid;
+ file->gid = st2.st_gid;
file->u.link = NULL;
} else
file->mode = save_mode;
file->u.link = NULL;
} else
file->mode = save_mode;
@@
-1389,7
+1394,7
@@
struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
- recv_uid_list(f);
+ recv_uid_list(f
, flist
);
/* Recv the io_error flag */
if (lp_ignore_errors(module_id) || ignore_errors)
/* Recv the io_error flag */
if (lp_ignore_errors(module_id) || ignore_errors)
@@
-1616,11
+1621,11
@@
static void output_flist(struct file_list *flist)
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if ((am_root || am_sender) && preserve_uid)
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if ((am_root || am_sender) && preserve_uid)
- sprintf(uidbuf, " uid=%ld", (long)file->
ids->
uid);
+ sprintf(uidbuf, " uid=%ld", (long)file->uid);
else
*uidbuf = '\0';
else
*uidbuf = '\0';
- if (preserve_gid && file->
ids->
gid != GID_NONE)
- sprintf(gidbuf, " gid=%ld", (long)file->
ids->
gid);
+ if (preserve_gid && file->gid != GID_NONE)
+ sprintf(gidbuf, " gid=%ld", (long)file->gid);
else
*gidbuf = '\0';
if (!am_sender)
else
*gidbuf = '\0';
if (!am_sender)