rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
(double) f->length, timestring(f->modtime),
- f_name(f), f->link);
+ f_name(f), f->u.link);
} else {
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
}
}
-
-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 modtime;
static mode_t mode;
static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T dev;
static uid_t uid;
static gid_t gid;
- static DEV64_T dev;
static char lastname[MAXPATHLEN];
char *fname, fbuf[MAXPATHLEN];
int l1, l2;
if (!file) {
write_byte(f, 0);
+ modtime = 0, mode = 0;
+ rdev = 0, dev = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
return;
}
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)
+ if (IS_DEVICE(mode)) {
+ if (file->u.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->u.rdev;
+ } else
+ rdev = 0;
+ } else if (IS_DEVICE(mode)) {
+ if ((file->u.rdev & ~0xFF) == rdev)
flags |= SAME_HIGH_RDEV;
else
- rdev = file->rdev & ~0xFF;
+ rdev = file->u.rdev & ~0xFF;
}
}
if (file->uid == uid)
if (file->dev == dev) {
if (protocol_version >= 28)
flags |= SAME_DEV;
- }
- else
+ } else
dev = file->dev;
flags |= HAS_INODE_DATA;
}
/* 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);
+ write_int(f, file->u.rdev);
else if (protocol_version >= 28)
- write_byte(f, file->rdev);
+ write_byte(f, file->u.rdev);
}
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
- write_int(f, strlen(file->link));
- write_buf(f, file->link, strlen(file->link));
+ write_int(f, strlen(file->u.link));
+ write_buf(f, file->u.link, strlen(file->u.link));
}
#endif
}
#endif
- 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);
+ if (always_checksum) {
+ char *sum;
+ if (S_ISREG(mode))
+ sum = file->u.sum;
+ else if (protocol_version < 28) {
+ /* Prior to 28, we sent a useless set of nulls. */
+ sum = empty_sum;
+ } else
+ sum = NULL;
+ if (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 modtime;
static mode_t mode;
static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T dev;
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;
char *p;
struct file_struct *file;
+ if (!fptr) {
+ modtime = 0, mode = 0;
+ rdev = 0, dev = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
+ return;
+ }
+
if (flags & SAME_NAME)
l1 = read_byte(f);
if (IS_DEVICE(mode)) {
if (!(flags & SAME_RDEV_pre28))
rdev = (DEV64_T)read_int(f);
- file->rdev = rdev;
+ file->u.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;
+ file->u.rdev = (DEV64_T)read_int(f);
+ rdev = file->u.rdev & ~0xFF;
} else
- file->rdev = rdev | (DEV64_T)read_byte(f);
+ file->u.rdev = rdev | (DEV64_T)read_byte(f);
}
}
rprintf(FERROR, "overflow: l=%d\n", l);
overflow("receive_file_entry");
}
- file->link = new_array(char, l + 1);
- if (!file->link)
+ if (!(file->u.link = new_array(char, l + 1)))
out_of_memory("receive_file_entry 2");
- read_sbuf(f, file->link, l);
+ read_sbuf(f, file->u.link, l);
if (sanitize_paths)
- sanitize_path(file->link, file->dirname);
+ sanitize_path(file->u.link, file->dirname);
}
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && protocol_version < 28
if (always_checksum) {
char *sum;
if (S_ISREG(mode)) {
- sum = file->sum = new_array(char, MD4_SUM_LENGTH);
+ sum = file->u.sum = new_array(char, MD4_SUM_LENGTH);
if (!sum)
out_of_memory("md4 sum");
} else if (protocol_version < 28) {
}
}
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- file->rdev = st.st_rdev;
+ if (IS_DEVICE(st.st_mode))
+ file->u.rdev = st.st_rdev;
#endif
#if SUPPORT_LINKS
if (S_ISLNK(st.st_mode))
- file->link = STRDUP(ap, linkbuf);
+ file->u.link = STRDUP(ap, linkbuf);
#endif
if (always_checksum && S_ISREG(st.st_mode)) {
- file->sum = (char*)MALLOC(ap, MD4_SUM_LENGTH);
- if (!file->sum)
+ if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
out_of_memory("md4 sum");
- file_checksum(fname, file->sum, st.st_size);
+ file_checksum(fname, file->u.sum, st.st_size);
}
if (flist_dir) {
f_name(flist->files[i]));
}
}
-
+ receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
return;
if (file->basename)
free(file->basename);
- if (file->link)
- free(file->link);
- if (file->sum)
- free(file->sum);
+ if (!IS_DEVICE(file->mode) && file->u.link)
+ free(file->u.link); /* Handles u.sum too. */
*file = null_file;
}
flist->files[i][0] = null_file;
else
free_file(flist->files[i]);
- }
- else
+ } else
prev_i = i;
}
if (!(c1 = (uchar*)f1->dirname)) {
state1 = fnc_BASE;
c1 = (uchar*)f1->basename;
- }
- else
+ } else
state1 = fnc_DIR;
if (!(c2 = (uchar*)f2->dirname)) {
state2 = fnc_BASE;
c2 = (uchar*)f2->basename;
- }
- else
+ } else
state2 = fnc_DIR;
while (1) {