summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1aa4caf)
has the full device value) and an "rdev_high" variable (which zeros
the lower byte in the last rdev value).
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 rdev; /* just high bytes in p28 onward */
+ static DEV64_T rdev, rdev_high;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
+ rdev = 0, rdev_high = 0, dev = 0;
uid = 0, gid = 0;
*lastname = '\0';
return;
uid = 0, gid = 0;
*lastname = '\0';
return;
} else
rdev = 0;
} else if (IS_DEVICE(mode)) {
} else
rdev = 0;
} else if (IS_DEVICE(mode)) {
- if ((file->u.rdev & ~0xFF) == rdev)
+ if ((file->u.rdev & ~0xFF) == rdev_high)
flags |= XMIT_SAME_HIGH_RDEV;
flags |= XMIT_SAME_HIGH_RDEV;
- else
- rdev = file->u.rdev & ~0xFF;
+ else {
+ rdev = file->u.rdev;
+ rdev_high = rdev & ~0xFF;
+ }
}
}
if (file->uid == uid)
}
}
if (file->uid == uid)
}
if (preserve_devices && IS_DEVICE(mode)) {
/* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
}
if (preserve_devices && IS_DEVICE(mode)) {
/* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
- * also off. Also, avoid using "rdev" because it may be
- * incomplete. */
if (!(flags & XMIT_SAME_HIGH_RDEV))
if (!(flags & XMIT_SAME_HIGH_RDEV))
- write_int(f, file->u.rdev);
else if (protocol_version >= 28)
else if (protocol_version >= 28)
- write_byte(f, file->u.rdev);
{
static time_t modtime;
static mode_t mode;
{
static time_t modtime;
static mode_t mode;
- static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T rdev, rdev_high;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
if (!fptr) {
modtime = 0, mode = 0;
if (!fptr) {
modtime = 0, mode = 0;
+ rdev = 0, rdev_high = 0, dev = 0;
uid = 0, gid = 0;
*lastname = '\0';
return;
uid = 0, gid = 0;
*lastname = '\0';
return;
rdev = 0;
} else if (IS_DEVICE(mode)) {
if (!(flags & XMIT_SAME_HIGH_RDEV)) {
rdev = 0;
} else if (IS_DEVICE(mode)) {
if (!(flags & XMIT_SAME_HIGH_RDEV)) {
- file->u.rdev = (DEV64_T)read_int(f);
- rdev = file->u.rdev & ~0xFF;
+ rdev = (DEV64_T)read_int(f);
+ rdev_high = rdev & ~0xFF;
- file->u.rdev = rdev | (DEV64_T)read_byte(f);
+ rdev = rdev_high | (DEV64_T)read_byte(f);
+ file->u.rdev = rdev;
}
}
#ifdef HAVE_STRUCT_STAT_ST_RDEV
}
}
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- if (IS_DEVICE(st.st_mode))
+ if (preserve_devices && IS_DEVICE(st.st_mode))
file->u.rdev = st.st_rdev;
#endif
file->u.rdev = st.st_rdev;
#endif