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
- hard links
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
64808a0
..
04913c2
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-43,7
+43,7
@@
void send_file_entry_v10(struct file_struct *file,int f)
{
unsigned char flags;
static mode_t last_mode=0;
{
unsigned char flags;
static mode_t last_mode=0;
- static dev_t last_dev=0;
+ static dev_t last_
r
dev=0;
static uid_t last_uid=0;
static gid_t last_gid=0;
static char lastdir[MAXPATHLEN]="";
static uid_t last_uid=0;
static gid_t last_gid=0;
static char lastdir[MAXPATHLEN]="";
@@
-59,7
+59,7
@@
void send_file_entry_v10(struct file_struct *file,int f)
flags = FILE_VALID;
if (file->mode == last_mode) flags |= SAME_MODE;
flags = FILE_VALID;
if (file->mode == last_mode) flags |= SAME_MODE;
- if (file->
dev == last_dev) flags |= SAME_
DEV;
+ if (file->
rdev == last_rdev) flags |= SAME_R
DEV;
if (file->uid == last_uid) flags |= SAME_UID;
if (file->gid == last_gid) flags |= SAME_GID;
if (file->uid == last_uid) flags |= SAME_UID;
if (file->gid == last_gid) flags |= SAME_GID;
@@
-84,8
+84,8
@@
void send_file_entry_v10(struct file_struct *file,int f)
write_int(f,(int)file->uid);
if (preserve_gid && !(flags & SAME_GID))
write_int(f,(int)file->gid);
write_int(f,(int)file->uid);
if (preserve_gid && !(flags & SAME_GID))
write_int(f,(int)file->gid);
- if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_DEV))
- write_int(f,(int)file->dev);
+ if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_
R
DEV))
+ write_int(f,(int)file->
r
dev);
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
@@
-99,7
+99,7
@@
void send_file_entry_v10(struct file_struct *file,int f)
}
last_mode = file->mode;
}
last_mode = file->mode;
- last_
dev = file->
dev;
+ last_
rdev = file->r
dev;
last_uid = file->uid;
last_gid = file->gid;
p = strrchr(file->name,'/');
last_uid = file->uid;
last_gid = file->gid;
p = strrchr(file->name,'/');
@@
-118,7
+118,7
@@
void receive_file_entry_v10(struct file_struct *file,
unsigned char flags,int f)
{
static mode_t last_mode=0;
unsigned char flags,int f)
{
static mode_t last_mode=0;
- static dev_t last_dev=0;
+ static dev_t last_
r
dev=0;
static uid_t last_uid=0;
static gid_t last_gid=0;
static char lastdir[MAXPATHLEN]="";
static uid_t last_uid=0;
static gid_t last_gid=0;
static char lastdir[MAXPATHLEN]="";
@@
-148,7
+148,7
@@
void receive_file_entry_v10(struct file_struct *file,
if (preserve_gid)
file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f);
if (preserve_devices && IS_DEVICE(file->mode))
if (preserve_gid)
file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f);
if (preserve_devices && IS_DEVICE(file->mode))
- file->
dev = (flags & SAME_DEV) ? last_
dev : (dev_t)read_int(f);
+ file->
rdev = (flags & SAME_RDEV) ? last_r
dev : (dev_t)read_int(f);
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
@@
-164,7
+164,7
@@
void receive_file_entry_v10(struct file_struct *file,
read_buf(f,file->sum,csum_length);
last_mode = file->mode;
read_buf(f,file->sum,csum_length);
last_mode = file->mode;
- last_
dev = file->
dev;
+ last_
rdev = file->r
dev;
last_uid = file->uid;
last_gid = file->gid;
p = strrchr(file->name,'/');
last_uid = file->uid;
last_gid = file->gid;
p = strrchr(file->name,'/');