static void send_file_entry(struct file_struct *file, int f,
- unsigned base_flags)
+ unsigned short base_flags)
{
- unsigned char flags;
- static time_t last_time;
- static mode_t last_mode;
- static DEV64_T last_rdev;
- static uid_t last_uid;
- static gid_t last_gid;
+ unsigned short flags;
+ static time_t modtime;
+ static mode_t mode;
+ static DEV64_T rdev; /* just high bytes after p28 */
+ static uid_t uid;
+ static gid_t gid;
+ static DEV64_T dev;
static char lastname[MAXPATHLEN];
char *fname, fbuf[MAXPATHLEN];
int l1, l2;
flags = base_flags;
- if (file->mode == last_mode)
+ if (file->mode == mode)
flags |= SAME_MODE;
- if (file->rdev == last_rdev)
- flags |= SAME_RDEV;
- if (file->uid == last_uid)
+ else
+ mode = file->mode;
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ 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
+ rdev = file->rdev;
+ }
+ else if (IS_DEVICE(mode)) {
+ if ((file->rdev & ~0xFF) == rdev)
+ flags |= SAME_HIGH_RDEV;
+ else
+ rdev = file->rdev & ~0xFF;
+ }
+ }
+ if (file->uid == uid)
flags |= SAME_UID;
- if (file->gid == last_gid)
+ else
+ uid = file->uid;
+ if (file->gid == gid)
flags |= SAME_GID;
- if (file->modtime == last_time)
+ else
+ gid = file->gid;
+ if (file->modtime == modtime)
flags |= SAME_TIME;
+ else
+ modtime = file->modtime;
+ if (file->flags & HAS_INODE_DATA) {
+ if (file->dev == dev) {
+ if (protocol_version >= 28)
+ flags |= SAME_DEV;
+ }
+ else
+ dev = file->dev;
+ flags |= HAS_INODE_DATA;
+ }
for (l1 = 0;
lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
if (l2 > 255)
flags |= LONG_NAME;
- /* we must make sure we don't send a zero flags byte or the other
- end will terminate the flist transfer */
- if (flags == 0 && !S_ISDIR(file->mode))
- flags |= FLAG_DELETE;
- if (flags == 0)
- flags |= LONG_NAME;
-
- write_byte(f, flags);
+ /* We must make sure we don't send a zero flags byte or
+ * the other end will terminate the flist transfer. */
+ if (flags == 0 && !S_ISDIR(mode))
+ flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+ if (protocol_version >= 28) {
+ if ((flags & 0xFF00) || flags == 0) {
+ flags |= EXTENDED_FLAGS;
+ write_byte(f, flags);
+ write_byte(f, flags >> 8);
+ } else
+ write_byte(f, flags);
+ } else {
+ if (flags == 0)
+ flags |= LONG_NAME;
+ write_byte(f, flags);
+ }
if (flags & SAME_NAME)
write_byte(f, l1);
if (flags & LONG_NAME)
write_longint(f, file->length);
if (!(flags & SAME_TIME))
- write_int(f, (int) file->modtime);
+ write_int(f, modtime);
if (!(flags & SAME_MODE))
- write_int(f, to_wire_mode(file->mode));
+ write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & SAME_UID)) {
- add_uid(file->uid);
- write_int(f, (int) file->uid);
+ add_uid(uid);
+ write_int(f, uid);
}
if (preserve_gid && !(flags & SAME_GID)) {
- add_gid(file->gid);
- write_int(f, (int) file->gid);
+ add_gid(gid);
+ write_int(f, gid);
+ }
+ if (preserve_devices && IS_DEVICE(mode)) {
+ /* 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)
+ write_byte(f, file->rdev);
}
- if (preserve_devices && IS_DEVICE(file->mode)
- && !(flags & SAME_RDEV))
- write_int(f, (int) file->rdev);
#if SUPPORT_LINKS
- if (preserve_links && S_ISLNK(file->mode)) {
+ if (preserve_links && S_ISLNK(mode)) {
write_int(f, strlen(file->link));
write_buf(f, file->link, strlen(file->link));
}
#endif
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
+ if (flags & HAS_INODE_DATA) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
- write_int(f, (int) file->dev);
- write_int(f, (int) file->inode);
+ write_int(f, dev);
+ write_int(f, file->inode);
} else {
/* 64-bit dev_t and ino_t */
- write_longint(f, file->dev);
+ if (!(flags & SAME_DEV))
+ write_longint(f, dev);
write_longint(f, file->inode);
}
}
write_buf(f, file->sum, MD4_SUM_LENGTH);
}
- last_mode = file->mode;
- last_rdev = file->rdev;
- last_uid = file->uid;
- last_gid = file->gid;
- last_time = file->modtime;
-
strlcpy(lastname, fname, MAXPATHLEN);
lastname[MAXPATHLEN - 1] = 0;
static void receive_file_entry(struct file_struct **fptr,
- unsigned flags, int f)
+ unsigned short flags, int f)
{
- static time_t last_time;
- static mode_t last_mode;
- static DEV64_T last_rdev;
- static uid_t last_uid;
- static gid_t last_gid;
+ static time_t modtime;
+ static mode_t mode;
+ static DEV64_T rdev; /* just high bytes after p28 */
+ static uid_t uid;
+ static gid_t gid;
+ static DEV64_T dev;
static char lastname[MAXPATHLEN];
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
file->flags = flags;
file->length = read_longint(f);
- file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
- file->mode = (flags & SAME_MODE) ? last_mode
- : from_wire_mode(read_int(f));
- if (preserve_uid)
- file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f);
- if (preserve_gid)
- file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f);
- if (preserve_devices && IS_DEVICE(file->mode)) {
- file->rdev = (flags & SAME_RDEV) ? last_rdev
- : (DEV64_T)read_int(f);
+ if (!(flags & SAME_TIME))
+ modtime = (time_t)read_int(f);
+ file->modtime = modtime;
+ if (!(flags & SAME_MODE))
+ mode = from_wire_mode(read_int(f));
+ file->mode = mode;
+
+ if (preserve_uid) {
+ if (!(flags & SAME_UID))
+ uid = (uid_t)read_int(f);
+ file->uid = uid;
+ }
+ if (preserve_gid) {
+ if (!(flags & SAME_GID))
+ gid = (gid_t)read_int(f);
+ file->gid = gid;
+ }
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ if (IS_DEVICE(mode)) {
+ if (!(flags & SAME_RDEV_pre28))
+ rdev = (DEV64_T)read_int(f);
+ file->rdev = rdev;
+ } else
+ rdev = 0;
+ } else if (IS_DEVICE(mode)) {
+ if (!(flags & SAME_HIGH_RDEV)) {
+ file->rdev = (DEV64_T)read_int(f);
+ rdev = file->rdev & ~0xFF;
+ } else
+ file->rdev = rdev | (DEV64_T)read_byte(f);
+ }
}
- if (preserve_links && S_ISLNK(file->mode)) {
+ if (preserve_links && S_ISLNK(mode)) {
int l = read_int(f);
if (l < 0) {
rprintf(FERROR, "overflow: l=%d\n", l);
sanitize_path(file->link, file->dirname);
}
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
+ if (preserve_hard_links && protocol_version < 28
+ && S_ISREG(mode))
+ file->flags |= HAS_INODE_DATA;
+ if (file->flags & HAS_INODE_DATA) {
if (protocol_version < 26) {
- file->dev = read_int(f);
+ dev = read_int(f);
file->inode = read_int(f);
} else {
- file->dev = read_longint(f);
+ if (!(flags & SAME_DEV))
+ dev = read_longint(f);
file->inode = read_longint(f);
}
+ file->dev = dev;
}
#endif
read_buf(f, file->sum, MD4_SUM_LENGTH);
}
- last_mode = file->mode;
- last_rdev = file->rdev;
- last_uid = file->uid;
- last_gid = file->gid;
- last_time = file->modtime;
-
if (!preserve_perms) {
extern int orig_umask;
/* set an appropriate set of permissions based on original
file->mode = st.st_mode;
file->uid = st.st_uid;
file->gid = st.st_gid;
- file->dev = st.st_dev;
- file->inode = st.st_ino;
+ if (preserve_hard_links) {
+ if (protocol_version < 28? S_ISREG(st.st_mode)
+ : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
+ file->dev = st.st_dev;
+ file->inode = st.st_ino;
+ file->flags |= HAS_INODE_DATA;
+ }
+ }
#ifdef HAVE_STRUCT_STAT_ST_RDEV
file->rdev = st.st_rdev;
#endif
void send_file_name(int f, struct file_list *flist, char *fname,
- int recursive, unsigned base_flags)
+ int recursive, unsigned short base_flags)
{
struct file_struct *file;
char fbuf[MAXPATHLEN];
flist_expand(flist);
if (write_batch)
- file->flags = FLAG_DELETE;
+ file->flags |= FLAG_DELETE;
if (file->basename[0]) {
flist->files[flist->count++] = file;
struct file_list *recv_file_list(int f)
{
struct file_list *flist;
- unsigned char flags;
+ unsigned short flags;
int64 start_read;
extern int list_only;
goto oom;
- for (flags = read_byte(f); flags; flags = read_byte(f)) {
+ while ((flags = read_byte(f)) != 0) {
int i = flist->count;
flist_expand(flist);
+ if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+ flags |= read_byte(f) << 8;
receive_file_entry(&flist->files[i], flags, f);
if (S_ISREG(flist->files[i]->mode))
return;
for (i = 0; i < flist->count; i++) {
- rprintf(FINFO, "[%d] i=%d %s %s mode=0%o len=%.0f\n",
- (int) getpid(), i,
+ rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
+ (long) getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
(int) flist->files[i]->mode,
{
int dif;
const uchar *c1, *c2;
- enum fnc_state state1 = fnc_DIR, state2 = fnc_DIR;
+ enum fnc_state state1, state2;
if (!f1 || !f1->basename) {
if (!f2 || !f2->basename)
state1 = fnc_BASE;
c1 = (uchar*)f1->basename;
}
+ else
+ state1 = fnc_DIR;
if (!(c2 = (uchar*)f2->dirname)) {
state2 = fnc_BASE;
c2 = (uchar*)f2->basename;
}
+ else
+ state2 = fnc_DIR;
while (1) {
if ((dif = (int)*c1 - (int)*c2) != 0)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff