extern int verbose;
extern int do_progress;
+extern int am_root;
extern int am_server;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
+extern int numeric_ids;
extern int cvs_exclude;
int io_error;
static char empty_sum[MD4_SUM_LENGTH];
+static unsigned int min_file_struct_len;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
+
+
+void init_flist(void)
+{
+ struct file_struct f;
+
+ /* Figure out how big the file_struct is without trailing padding */
+ min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
+}
static int show_filelist_p(void)
* Make sure @p flist is big enough to hold at least @p flist->count
* entries.
**/
-static void flist_expand(struct file_list *flist)
+void flist_expand(struct file_list *flist)
{
- if (flist->count >= flist->malloced) {
- void *new_ptr;
+ void *new_ptr;
- if (flist->malloced < 1000)
- flist->malloced += 1000;
- else
- flist->malloced *= 2;
+ if (flist->count < flist->malloced)
+ return;
- if (flist->files) {
- new_ptr = realloc_array(flist->files,
- struct file_struct *,
- flist->malloced);
- } else {
- new_ptr = new_array(struct file_struct *,
- flist->malloced);
- }
+ if (flist->malloced < FLIST_START)
+ flist->malloced = FLIST_START;
+ else if (flist->malloced >= FLIST_LINEAR)
+ flist->malloced += FLIST_LINEAR;
+ else
+ flist->malloced *= 2;
+
+ /*
+ * In case count jumped or we are starting the list
+ * with a known size just set it.
+ */
+ if (flist->malloced < flist->count)
+ flist->malloced = flist->count;
+
+ if (flist->files) {
+ new_ptr = realloc_array(flist->files,
+ struct file_struct *, flist->malloced);
+ } else {
+ new_ptr = new_array(struct file_struct *, flist->malloced);
+ }
- if (verbose >= 2) {
- rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
- who_am_i(),
- (double)sizeof(flist->files[0])
- * flist->malloced,
- (new_ptr == flist->files) ? " not" : "");
- }
+ if (verbose >= 2) {
+ rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+ who_am_i(),
+ (double) sizeof flist->files[0] * flist->malloced,
+ (new_ptr == flist->files) ? " not" : "");
+ }
- flist->files = (struct file_struct **) new_ptr;
+ flist->files = (struct file_struct **) new_ptr;
- if (!flist->files)
- out_of_memory("flist_expand");
- }
+ if (!flist->files)
+ out_of_memory("flist_expand");
}
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- add_uid(uid);
+ if (!numeric_ids)
+ add_uid(uid);
write_int(f, uid);
}
if (preserve_gid && !(flags & XMIT_SAME_GID)) {
- add_gid(gid);
+ if (!numeric_ids)
+ add_gid(gid);
write_int(f, gid);
}
if (preserve_devices && IS_DEVICE(mode)) {
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
- int idev_len, idev_pad;
+ int file_struct_len, idev_len;
OFF_T file_length;
char *basename, *dirname, *bp;
struct file_struct *file;
idev_len = 0;
sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+ file_struct_len = idev_len? sizeof file[0] : min_file_struct_len;
- alloc_len = sizeof file[0] + dirname_len + basename_len
- + linkname_len + sum_len;
- if (idev_len) {
- idev_pad = (4 - (alloc_len % 4)) % 4;
- alloc_len += idev_pad + idev_len;
- } else
- idev_pad = 0;
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len + idev_len;
if (!(bp = new_array(char, alloc_len)))
out_of_memory("receive_file_entry");
file = *fptr = (struct file_struct *)bp;
- memset(bp, 0, sizeof file[0]);
- bp += sizeof file[0];
+ memset(bp, 0, min_file_struct_len);
+ bp += file_struct_len;
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
file->uid = uid;
file->gid = gid;
+#if SUPPORT_HARD_LINKS
+ if (idev_len) {
+ file->link_u.idev = (struct idev *)bp;
+ bp += idev_len;
+ }
+#endif
+
if (dirname_len) {
file->dirname = lastdir = bp;
lastdir_len = dirname_len - 1;
#if SUPPORT_HARD_LINKS
if (idev_len) {
- file->link_u.idev = (struct idev *)(bp + idev_pad);
- bp += idev_pad + idev_len;
if (protocol_version < 26) {
dev = read_int(f);
file->F_INODE = read_int(f);
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
- int idev_len, idev_pad;
+ int file_struct_len, idev_len;
char *basename, *dirname, *bp;
unsigned short flags = 0;
return NULL;
}
- if (one_file_system && st.st_dev != filesystem_dev) {
- /* We allow a directory though to preserve the mount point.
- * However, flag it so that we don't recurse. */
- if (!S_ISDIR(st.st_mode))
- return NULL;
+ /* We only care about directories because we need to avoid recursing
+ * into a mount-point directory, not to avoid copying a symlinked
+ * file if -L (or similar) was specified. */
+ if (one_file_system && st.st_dev != filesystem_dev
+ && S_ISDIR(st.st_mode))
flags |= FLAG_MOUNT_POINT;
- }
if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
return NULL;
#if SUPPORT_HARD_LINKS
if (preserve_hard_links) {
- idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode)
- : !S_ISDIR(st.st_mode) && st.st_nlink > 1)
- ? sizeof (struct idev) : 0;
+ if (protocol_version < 28) {
+ if (S_ISREG(st.st_mode))
+ idev_len = sizeof (struct idev);
+ else
+ idev_len = 0;
+ } else {
+ if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+ idev_len = sizeof (struct idev);
+ else
+ idev_len = 0;
+ }
} else
#endif
idev_len = 0;
sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+ file_struct_len = idev_len? sizeof file[0] : min_file_struct_len;
- alloc_len = sizeof file[0] + dirname_len + basename_len
- + linkname_len + sum_len;
- if (idev_len) {
- idev_pad = (4 - (alloc_len % 4)) % 4;
- alloc_len += idev_pad + idev_len;
- } else
- idev_pad = 0;
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len + idev_len;
if (!(bp = new_array(char, alloc_len)))
out_of_memory("receive_file_entry");
file = (struct file_struct *)bp;
- memset(bp, 0, sizeof file[0]);
- bp += sizeof file[0];
+ memset(bp, 0, min_file_struct_len);
+ bp += file_struct_len;
file->flags = flags;
file->modtime = st.st_mtime;
file->uid = st.st_uid;
file->gid = st.st_gid;
+#if SUPPORT_HARD_LINKS
+ if (idev_len) {
+ file->link_u.idev = (struct idev *)bp;
+ bp += idev_len;
+ file->F_DEV = st.st_dev;
+ file->F_INODE = st.st_ino;
+ }
+#endif
+
if (dirname_len) {
file->dirname = lastdir = bp;
lastdir_len = dirname_len - 1;
}
#endif
-#if SUPPORT_HARD_LINKS
- if (idev_len) {
- file->link_u.idev = (struct idev *)(bp + idev_pad);
- bp += idev_pad + idev_len;
- file->F_DEV = st.st_dev;
- file->F_INODE = st.st_ino;
- }
-#endif
-
if (sum_len) {
file->u.sum = bp;
file_checksum(thisname, bp, st.st_size);
write_batch_flist_info(flist->count, flist->files);
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
}
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (list_only) {
int i;
for (i = 0; i < flist->count; i++)
if (free_the_struct)
free(file);
else
- memset(file, 0, sizeof file[0]);
+ memset(file, 0, min_file_struct_len);
}
return;
qsort(flist->files, flist->count,
- sizeof(flist->files[0]), (int (*)()) file_compare);
+ sizeof flist->files[0], (int (*)()) file_compare);
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) {
}
}
}
+}
- if (verbose <= 3)
- return;
+static void output_flist(struct file_list *flist)
+{
+ char uidbuf[16], gidbuf[16];
+ struct file_struct *file;
+ int i;
for (i = 0; i < flist->count; i++) {
- rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
- who_am_i(), i,
- NS(flist->files[i]->basedir),
- NS(flist->files[i]->dirname),
- NS(flist->files[i]->basename),
- (int) flist->files[i]->mode,
- (double) flist->files[i]->length);
+ file = flist->files[i];
+ if (am_root && preserve_uid)
+ sprintf(uidbuf, " uid=%ld", (long)file->uid);
+ else
+ *uidbuf = '\0';
+ if (preserve_gid && file->gid != GID_NONE)
+ sprintf(gidbuf, " gid=%ld", (long)file->gid);
+ else
+ *gidbuf = '\0';
+ rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
+ who_am_i(), i, NS(file->basedir), NS(file->dirname),
+ NS(file->basename), (int) file->mode,
+ (double) file->length, uidbuf, gidbuf);
}
}