int io_error;
static struct file_struct null_file;
+static char empty_sum[MD4_SUM_LENGTH];
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
}
}
+/* These vars are used by both send_file_entry() and receive_file_entry()
+ * (but just one at a time). They have been placed outside these functions
+ * so that we can reset the values when the batch-processing wants to make
+ * extra use of these functions (which needs to start from a known state). */
+static time_t modtime;
+static mode_t mode;
+static DEV64_T rdev; /* just high bytes in p28 onward */
+static uid_t uid;
+static gid_t gid;
+static DEV64_T dev;
+static char lastname[MAXPATHLEN];
+
+void reset_file_entry_vars(void)
+{
+ modtime = 0;
+ mode = 0;
+ rdev = 0;
+ uid = 0;
+ gid = 0;
+ dev = 0;
+ *lastname = '\0';
+}
-static void send_file_entry(struct file_struct *file, int f,
- unsigned short base_flags)
+void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
{
unsigned short 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;
- 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;
else
- last_mode = file->mode;
+ mode = file->mode;
if (preserve_devices) {
if (protocol_version < 28) {
- if (IS_DEVICE(last_mode) && file->rdev == last_rdev)
- flags |= OLD_SAME_RDEV|SAME_HIGH_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
- last_rdev = file->rdev;
+ rdev = file->rdev;
}
- else if (IS_DEVICE(last_mode)) {
- if ((file->rdev & ~0xFF) == (last_rdev & ~0xFF))
+ else if (IS_DEVICE(mode)) {
+ if ((file->rdev & ~0xFF) == rdev)
flags |= SAME_HIGH_RDEV;
- last_rdev = file->rdev;
+ else
+ rdev = file->rdev & ~0xFF;
}
}
- if (file->uid == last_uid)
+ if (file->uid == uid)
flags |= SAME_UID;
else
- last_uid = file->uid;
- if (file->gid == last_gid)
+ uid = file->uid;
+ if (file->gid == gid)
flags |= SAME_GID;
else
- last_gid = file->gid;
- if (file->modtime == last_time)
+ gid = file->gid;
+ if (file->modtime == modtime)
flags |= SAME_TIME;
else
- last_time = file->modtime;
+ 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);
/* 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(last_mode))
+ if (flags == 0 && !S_ISDIR(mode))
flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
if (protocol_version >= 28) {
if ((flags & 0xFF00) || flags == 0) {
write_longint(f, file->length);
if (!(flags & SAME_TIME))
- write_int(f, last_time);
+ write_int(f, modtime);
if (!(flags & SAME_MODE))
- write_int(f, to_wire_mode(last_mode));
+ write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & SAME_UID)) {
- add_uid(last_uid);
- write_int(f, last_uid);
+ add_uid(uid);
+ write_int(f, uid);
}
if (preserve_gid && !(flags & SAME_GID)) {
- add_gid(last_gid);
- write_int(f, last_gid);
+ add_gid(gid);
+ write_int(f, gid);
}
- if (preserve_devices && IS_DEVICE(last_mode)) {
- /* If SAME_HIGH_RDEV is off, OLD_SAME_RDEV is also off. */
+ 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, last_rdev);
+ write_int(f, file->rdev);
else if (protocol_version >= 28)
- write_byte(f, last_rdev);
+ write_byte(f, file->rdev);
}
#if SUPPORT_LINKS
- if (preserve_links && S_ISLNK(last_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);
}
}
#endif
- if (always_checksum) {
- if (protocol_version < 21)
- write_buf(f, file->sum, 2);
- else
- write_buf(f, file->sum, MD4_SUM_LENGTH);
+ if (always_checksum && (protocol_version < 28 || S_ISREG(mode))) {
+ char *sum = file->sum? file->sum : empty_sum;
+ write_buf(f, sum, protocol_version < 21? 2
+ : MD4_SUM_LENGTH);
}
strlcpy(lastname, fname, MAXPATHLEN);
-static void receive_file_entry(struct file_struct **fptr,
- unsigned short flags, int f)
+void receive_file_entry(struct file_struct **fptr, 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 char lastname[MAXPATHLEN];
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
char *p;
file->flags = flags;
file->length = read_longint(f);
if (!(flags & SAME_TIME))
- last_time = (time_t)read_int(f);
- file->modtime = last_time;
+ modtime = (time_t)read_int(f);
+ file->modtime = modtime;
if (!(flags & SAME_MODE))
- last_mode = from_wire_mode(read_int(f));
- file->mode = last_mode;
+ mode = from_wire_mode(read_int(f));
+ file->mode = mode;
if (preserve_uid) {
if (!(flags & SAME_UID))
- last_uid = (uid_t)read_int(f);
- file->uid = last_uid;
+ uid = (uid_t)read_int(f);
+ file->uid = uid;
}
if (preserve_gid) {
if (!(flags & SAME_GID))
- last_gid = (gid_t)read_int(f);
- file->gid = last_gid;
+ gid = (gid_t)read_int(f);
+ file->gid = gid;
}
if (preserve_devices) {
if (protocol_version < 28) {
- if (IS_DEVICE(last_mode)) {
- if (!(flags & OLD_SAME_RDEV))
- last_rdev = (DEV64_T)read_int(f);
- file->rdev = last_rdev;
+ if (IS_DEVICE(mode)) {
+ if (!(flags & SAME_RDEV_pre28))
+ rdev = (DEV64_T)read_int(f);
+ file->rdev = rdev;
} else
- last_rdev = 0;
- } else if (IS_DEVICE(last_mode)) {
- if (!(flags & SAME_HIGH_RDEV))
- last_rdev = (DEV64_T)read_int(f);
- else {
- last_rdev = (DEV64_T)((last_rdev & ~0xFF)
- | read_byte(f));
- }
- file->rdev = last_rdev;
+ 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(last_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
if (always_checksum) {
- file->sum = new_array(char, MD4_SUM_LENGTH);
- if (!file->sum)
- out_of_memory("md4 sum");
- if (protocol_version < 21)
- read_buf(f, file->sum, 2);
- else
- read_buf(f, file->sum, MD4_SUM_LENGTH);
+ char *sum;
+ if (S_ISREG(mode)) {
+ sum = file->sum = new_array(char, MD4_SUM_LENGTH);
+ if (!sum)
+ out_of_memory("md4 sum");
+ } else if (protocol_version < 28) {
+ /* Prior to 28, we get a useless set of nulls. */
+ sum = empty_sum;
+ } else
+ sum = NULL;
+ if (sum) {
+ read_buf(f, sum, protocol_version < 21? 2
+ : MD4_SUM_LENGTH);
+ }
}
if (!preserve_perms) {
extern int orig_umask;
/* set an appropriate set of permissions based on original
- permissions and umask. This emulates what GNU cp does */
+ * permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
}
}
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
file->link = STRDUP(ap, linkbuf);
#endif
- if (always_checksum) {
- file->sum = (char *) MALLOC(ap, MD4_SUM_LENGTH);
+ if (always_checksum && S_ISREG(st.st_mode)) {
+ file->sum = (char*)MALLOC(ap, MD4_SUM_LENGTH);
if (!file->sum)
out_of_memory("md4 sum");
- /* drat. we have to provide a null checksum for non-regular
- files in order to be compatible with earlier versions
- of rsync */
- if (S_ISREG(st.st_mode)) {
- file_checksum(fname, file->sum, st.st_size);
- } else {
- memset(file->sum, 0, MD4_SUM_LENGTH);
- }
+ file_checksum(fname, file->sum, st.st_size);
}
if (flist_dir) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff