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
Added an extra comment.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
9b7dcf5
..
f1b054f
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-357,7
+357,7
@@
static void send_file_entry(struct file_struct *file, int f,
unsigned short flags;
static time_t modtime;
static mode_t mode;
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static DEV64_T
last_rdev;
+ static DEV64_T
rdev; /* just high bytes after p28 */
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
@@
-385,19
+385,19
@@
static void send_file_entry(struct file_struct *file, int f,
mode = file->mode;
if (preserve_devices) {
if (protocol_version < 28) {
mode = file->mode;
if (preserve_devices) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode) && file->rdev ==
last_
rdev) {
+ if (IS_DEVICE(mode) && file->rdev == rdev) {
/* Set both flags so that the test when
* writing the data is simpler. */
flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
}
else
/* Set both flags so that the test when
* writing the data is simpler. */
flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
}
else
-
last_
rdev = file->rdev;
+ rdev = file->rdev;
}
else if (IS_DEVICE(mode)) {
}
else if (IS_DEVICE(mode)) {
- if ((file->rdev & ~0xFF) ==
last_
rdev)
+ if ((file->rdev & ~0xFF) == rdev)
flags |= SAME_HIGH_RDEV;
else
flags |= SAME_HIGH_RDEV;
else
-
last_
rdev = file->rdev & ~0xFF;
+ rdev = file->rdev & ~0xFF;
}
}
if (file->uid == uid)
}
}
if (file->uid == uid)
@@
-470,7
+470,8
@@
static void send_file_entry(struct file_struct *file, int f,
write_int(f, gid);
}
if (preserve_devices && IS_DEVICE(mode)) {
write_int(f, gid);
}
if (preserve_devices && IS_DEVICE(mode)) {
- /* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off. */
+ /* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off.
+ * Also, avoid using "rdev" because it may be incomplete. */
if (!(flags & SAME_HIGH_RDEV))
write_int(f, file->rdev);
else if (protocol_version >= 28)
if (!(flags & SAME_HIGH_RDEV))
write_int(f, file->rdev);
else if (protocol_version >= 28)
@@
-519,7
+520,7
@@
static void receive_file_entry(struct file_struct **fptr,
{
static time_t modtime;
static mode_t mode;
{
static time_t modtime;
static mode_t mode;
- static DEV64_T rdev;
+ static DEV64_T rdev;
/* just high bytes after p28 */
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
@@
-613,7
+614,7
@@
static void receive_file_entry(struct file_struct **fptr,
file->rdev = (DEV64_T)read_int(f);
rdev = file->rdev & ~0xFF;
} else
file->rdev = (DEV64_T)read_int(f);
rdev = file->rdev & ~0xFF;
} else
- file->rdev =
(DEV64_T)(rdev | read_byte(f)
);
+ file->rdev =
rdev | (DEV64_T)read_byte(f
);
}
}
}
}