/** @file flist.c
* Generate and receive file lists
*
- * @todo Get rid of the string_area optimization. Efficiently
- * allocating blocks is the responsibility of the system's malloc
- * library, not of rsync.
- *
* @sa http://lists.samba.org/pipermail/rsync/2000-June/002351.html
*
**/
extern int verbose;
extern int do_progress;
+extern int am_root;
extern int am_server;
+extern int am_daemon;
extern int always_checksum;
+extern int module_id;
+extern int ignore_errors;
+extern int numeric_ids;
extern int cvs_exclude;
extern int recurse;
+extern char curr_dir[MAXPATHLEN];
extern char *files_from;
extern int filesfrom_fd;
extern int one_file_system;
-extern int make_backups;
+extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
extern int preserve_uid;
extern int preserve_gid;
-extern int preserve_times;
extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
extern int copy_unsafe_links;
-extern int remote_version;
-extern int io_error;
+extern int protocol_version;
extern int sanitize_paths;
+extern int delete_excluded;
+extern int orig_umask;
+extern int list_only;
extern int read_batch;
extern int write_batch;
-extern struct exclude_struct **exclude_list;
-extern struct exclude_struct **server_exclude_list;
-extern struct exclude_struct **local_exclude_list;
+extern struct exclude_list_struct exclude_list;
+extern struct exclude_list_struct server_exclude_list;
+extern struct exclude_list_struct local_exclude_list;
+
+int io_error;
-static struct file_struct null_file;
+static char empty_sum[MD4_SUM_LENGTH];
+static unsigned int 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 */
+ file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
+}
static int show_filelist_p(void)
static void start_filelist_progress(char *kind)
{
rprintf(FINFO, "%s ... ", kind);
- if ((verbose > 1) || do_progress)
+ if (verbose > 1 || do_progress)
rprintf(FINFO, "\n");
rflush(FINFO);
}
static void maybe_emit_filelist_progress(const struct file_list *flist)
{
- if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+ if (do_progress && show_filelist_p() && (flist->count % 100) == 0)
emit_filelist_progress(flist);
}
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
flist->count, flist->count == 1 ? " " : "s ");
- } else {
+ } else
rprintf(FINFO, "done\n");
- }
}
void show_flist_stats(void)
}
-static struct string_area *string_area_new(int size)
-{
- struct string_area *a;
-
- if (size <= 0)
- size = ARENA_SIZE;
- a = malloc(sizeof(*a));
- if (!a)
- out_of_memory("string_area_new");
- a->current = a->base = malloc(size);
- if (!a->current)
- out_of_memory("string_area_new buffer");
- a->end = a->base + size;
- a->next = NULL;
-
- return a;
-}
-
-static void string_area_free(struct string_area *a)
-{
- struct string_area *next;
-
- for (; a; a = next) {
- next = a->next;
- free(a->base);
- }
-}
-
-static char *string_area_malloc(struct string_area **ap, int size)
-{
- char *p;
- struct string_area *a;
-
- /* does the request fit into the current space? */
- a = *ap;
- if (a->current + size >= a->end) {
- /* no; get space, move new string_area to front of the list */
- a = string_area_new(size > ARENA_SIZE ? size : ARENA_SIZE);
- a->next = *ap;
- *ap = a;
- }
-
- /* have space; do the "allocation." */
- p = a->current;
- a->current += size;
- return p;
-}
-
-static char *string_area_strdup(struct string_area **ap, const char *src)
-{
- char *dest = string_area_malloc(ap, strlen(src) + 1);
- return strcpy(dest, src);
-}
-
static void list_file_entry(struct file_struct *f)
{
char perms[11];
- if (!f->basename)
+ if (!f->basename) {
/* this can happen if duplicate names were removed */
return;
+ }
permstring(perms, f->mode);
+#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
- (double) f->length, timestring(f->modtime),
- f_name(f), f->link);
- } else {
+ (double)f->length, timestring(f->modtime),
+ f_name(f), f->u.link);
+ } else
+#endif
+ {
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
- (double) f->length, timestring(f->modtime),
+ (double)f->length, timestring(f->modtime),
f_name(f));
}
}
* @post @p buffer contains information about the link or the
* referrent as appropriate, if they exist.
**/
-int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
+int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
{
#if SUPPORT_LINKS
- if (copy_links) {
+ if (copy_links)
return do_stat(path, buffer);
- }
- if (do_lstat(path, buffer) == -1) {
+ if (link_stat(path, buffer, keep_dirlinks) < 0)
return -1;
- }
if (S_ISLNK(buffer->st_mode)) {
- int l;
- l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+ int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
if (l == -1)
return -1;
linkbuf[l] = 0;
#endif
}
-int link_stat(const char *path, STRUCT_STAT * buffer)
+int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
{
#if SUPPORT_LINKS
- if (copy_links) {
+ if (copy_links)
return do_stat(path, buffer);
- } else {
- return do_lstat(path, buffer);
+ if (do_lstat(path, buffer) < 0)
+ return -1;
+ if (follow_dirlinks && S_ISLNK(buffer->st_mode)) {
+ STRUCT_STAT st;
+ if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+ *buffer = st;
}
+ return 0;
#else
return do_stat(path, buffer);
#endif
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
+ int rc;
+
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
#endif
- if (fname && fname[0] == '.' && !fname[1]) {
+ if (fname) {
/* never exclude '.', even if somebody does --exclude '*' */
- return 0;
+ if (fname[0] == '.' && !fname[1])
+ return 0;
+ /* Handle the -R version of the '.' dir. */
+ if (fname[0] == '/') {
+ int len = strlen(fname);
+ if (fname[len-1] == '.' && fname[len-2] == '/')
+ return 0;
+ }
}
- if (server_exclude_list &&
- check_exclude(server_exclude_list, fname, is_dir))
+ if (server_exclude_list.head
+ && check_exclude(&server_exclude_list, fname, is_dir) < 0)
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
- if (exclude_list && check_exclude(exclude_list, fname, is_dir))
- return 1;
- if (local_exclude_list &&
- check_exclude(local_exclude_list, fname, is_dir))
+ if (exclude_list.head
+ && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+ return rc < 0;
+ if (local_exclude_list.head
+ && check_exclude(&local_exclude_list, fname, is_dir) < 0)
return 1;
return 0;
}
static void set_filesystem(char *fname)
{
STRUCT_STAT st;
- if (link_stat(fname, &st) != 0)
+ if (do_stat(fname, &st) != 0)
return;
filesystem_dev = st.st_dev;
}
static int to_wire_mode(mode_t mode)
{
- if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
+#if SUPPORT_LINKS
+ if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | 0120000;
- }
- return (int) mode;
+#endif
+ return (int)mode;
}
static mode_t from_wire_mode(int mode)
{
- if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+ if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | _S_IFLNK;
- }
- return (mode_t) mode;
+ return (mode_t)mode;
}
static void send_directory(int f, struct file_list *flist, char *dir);
static char *flist_dir;
+static int flist_dir_len;
/**
* 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) {
- size_t new_bytes;
- void *new_ptr;
+ struct file_struct **new_ptr;
- if (flist->malloced < 1000)
- flist->malloced += 1000;
- else
- flist->malloced *= 2;
-
- new_bytes = sizeof(flist->files[0]) * flist->malloced;
-
- if (flist->files)
- new_ptr = realloc(flist->files, new_bytes);
- else
- new_ptr = malloc(new_bytes);
+ if (flist->count < flist->malloced)
+ return;
- if (verbose >= 2) {
- rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
- (double) new_bytes,
- (new_ptr == flist->files) ? " not" : "");
- }
+ 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;
+
+ new_ptr = realloc_array(flist->files, 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" : "");
+ }
- flist->files = (struct file_struct **) new_ptr;
+ flist->files = new_ptr;
- if (!flist->files)
- out_of_memory("flist_expand");
- }
+ if (!flist->files)
+ out_of_memory("flist_expand");
}
-
-static void send_file_entry(struct file_struct *file, int f,
- unsigned base_flags)
+void send_file_entry(struct file_struct *file, int f, 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 uint64 dev;
+ static dev_t rdev;
+ static uint32 rdev_major;
+ static uid_t uid;
+ static gid_t gid;
static char lastname[MAXPATHLEN];
- char *fname;
+ char fname[MAXPATHLEN];
int l1, l2;
if (f == -1)
if (!file) {
write_byte(f, 0);
+ modtime = 0, mode = 0;
+ dev = 0, rdev = makedev(0, 0);
+ rdev_major = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
return;
}
io_write_phase = "send_file_entry";
- fname = f_name(file);
+ f_name_to(file, fname);
flags = base_flags;
- if (file->mode == last_mode)
- flags |= SAME_MODE;
- if (file->rdev == last_rdev)
- flags |= SAME_RDEV;
- if (file->uid == last_uid)
- flags |= SAME_UID;
- if (file->gid == last_gid)
- flags |= SAME_GID;
- if (file->modtime == last_time)
- flags |= SAME_TIME;
+ if (file->mode == mode)
+ flags |= XMIT_SAME_MODE;
+ else
+ mode = file->mode;
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ if (IS_DEVICE(mode)) {
+ if (file->u.rdev == rdev)
+ flags |= XMIT_SAME_RDEV_pre28;
+ else
+ rdev = file->u.rdev;
+ } else
+ rdev = makedev(0, 0);
+ } else if (IS_DEVICE(mode)) {
+ rdev = file->u.rdev;
+ if ((uint32)major(rdev) == rdev_major)
+ flags |= XMIT_SAME_RDEV_MAJOR;
+ else
+ rdev_major = major(rdev);
+ if ((uint32)minor(rdev) <= 0xFFu)
+ flags |= XMIT_RDEV_MINOR_IS_SMALL;
+ }
+ }
+ if (file->uid == uid)
+ flags |= XMIT_SAME_UID;
+ else
+ uid = file->uid;
+ if (file->gid == gid)
+ flags |= XMIT_SAME_GID;
+ else
+ gid = file->gid;
+ if (file->modtime == modtime)
+ flags |= XMIT_SAME_TIME;
+ else
+ modtime = file->modtime;
+
+#if SUPPORT_HARD_LINKS
+ if (file->link_u.idev) {
+ if (file->F_DEV == dev) {
+ if (protocol_version >= 28)
+ flags |= XMIT_SAME_DEV;
+ } else
+ dev = file->F_DEV;
+ flags |= XMIT_HAS_IDEV_DATA;
+ }
+#endif
for (l1 = 0;
- lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
- l1++) {}
- l2 = strlen(fname) - l1;
+ lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
+ l1++) {}
+ l2 = strlen(fname+l1);
if (l1 > 0)
- flags |= SAME_NAME;
+ flags |= XMIT_SAME_NAME;
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);
- if (flags & SAME_NAME)
+ flags |= XMIT_LONG_NAME;
+
+ /* We must make sure we don't send a zero flag byte or the
+ * other end will terminate the flist transfer. Note that
+ * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+ * it's harmless way to add a bit to the first flag byte. */
+ if (protocol_version >= 28) {
+ if (!flags && !S_ISDIR(mode))
+ flags |= XMIT_TOP_DIR;
+ if ((flags & 0xFF00) || !flags) {
+ flags |= XMIT_EXTENDED_FLAGS;
+ write_byte(f, flags);
+ write_byte(f, flags >> 8);
+ } else
+ write_byte(f, flags);
+ } else {
+ if (!(flags & 0xFF) && !S_ISDIR(mode))
+ flags |= XMIT_TOP_DIR;
+ if (!(flags & 0xFF))
+ flags |= XMIT_LONG_NAME;
+ write_byte(f, flags);
+ }
+ if (flags & XMIT_SAME_NAME)
write_byte(f, l1);
- if (flags & LONG_NAME)
+ if (flags & XMIT_LONG_NAME)
write_int(f, l2);
else
write_byte(f, l2);
write_buf(f, fname + l1, l2);
write_longint(f, file->length);
- if (!(flags & SAME_TIME))
- write_int(f, (int) file->modtime);
- if (!(flags & SAME_MODE))
- write_int(f, to_wire_mode(file->mode));
- if (preserve_uid && !(flags & SAME_UID)) {
- add_uid(file->uid);
- write_int(f, (int) file->uid);
+ if (!(flags & XMIT_SAME_TIME))
+ write_int(f, modtime);
+ if (!(flags & XMIT_SAME_MODE))
+ write_int(f, to_wire_mode(mode));
+ if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ if (!numeric_ids)
+ add_uid(uid);
+ write_int(f, uid);
}
- if (preserve_gid && !(flags & SAME_GID)) {
- add_gid(file->gid);
- write_int(f, (int) file->gid);
+ if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+ if (!numeric_ids)
+ add_gid(gid);
+ write_int(f, gid);
+ }
+ if (preserve_devices && IS_DEVICE(mode)) {
+ if (protocol_version < 28) {
+ if (!(flags & XMIT_SAME_RDEV_pre28))
+ write_int(f, (int)rdev);
+ } else {
+ if (!(flags & XMIT_SAME_RDEV_MAJOR))
+ write_int(f, major(rdev));
+ if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+ write_byte(f, minor(rdev));
+ else
+ write_int(f, minor(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)) {
- write_int(f, strlen(file->link));
- write_buf(f, file->link, strlen(file->link));
+ if (preserve_links && S_ISLNK(mode)) {
+ int len = strlen(file->u.link);
+ write_int(f, len);
+ write_buf(f, file->u.link, len);
}
#endif
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
+ if (flags & XMIT_HAS_IDEV_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->F_INODE);
} else {
/* 64-bit dev_t and ino_t */
- write_longint(f, file->dev);
- write_longint(f, file->inode);
+ if (!(flags & XMIT_SAME_DEV))
+ write_longint(f, dev);
+ write_longint(f, file->F_INODE);
}
}
#endif
if (always_checksum) {
- if (remote_version < 21) {
- write_buf(f, file->sum, 2);
- } else {
- write_buf(f, file->sum, MD4_SUM_LENGTH);
+ 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);
}
}
- 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;
io_write_phase = "unknown";
}
-static void receive_file_entry(struct file_struct **fptr,
- unsigned flags, int f)
+void receive_file_entry(struct file_struct **fptr, unsigned short flags,
+ struct file_list *flist, 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];
+ static time_t modtime;
+ static mode_t mode;
+ static uint64 dev;
+ static dev_t rdev;
+ static uint32 rdev_major;
+ static uid_t uid;
+ static gid_t gid;
+ static char lastname[MAXPATHLEN], *lastdir;
+ static int lastdir_len = -1;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
- char *p;
+ int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ OFF_T file_length;
+ char *basename, *dirname, *bp;
struct file_struct *file;
- if (flags & SAME_NAME)
+ if (!fptr) {
+ modtime = 0, mode = 0;
+ dev = 0, rdev = makedev(0, 0);
+ rdev_major = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
+ lastdir_len = -1;
+ return;
+ }
+
+ if (flags & XMIT_SAME_NAME)
l1 = read_byte(f);
- if (flags & LONG_NAME)
+ if (flags & XMIT_LONG_NAME)
l2 = read_int(f);
else
l2 = read_byte(f);
- file = (struct file_struct *) malloc(sizeof(*file));
- if (!file)
- out_of_memory("receive_file_entry");
- memset((char *) file, 0, sizeof(*file));
- (*fptr) = file;
-
if (l2 >= MAXPATHLEN - l1) {
rprintf(FERROR,
"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
thisname[l1 + l2] = 0;
strlcpy(lastname, thisname, MAXPATHLEN);
- lastname[MAXPATHLEN - 1] = 0;
clean_fname(thisname);
- if (sanitize_paths) {
+ if (sanitize_paths)
sanitize_path(thisname, NULL);
+
+ if ((basename = strrchr(thisname, '/')) != NULL) {
+ dirname_len = ++basename - thisname; /* counts future '\0' */
+ if (lastdir_len == dirname_len - 1
+ && strncmp(thisname, lastdir, lastdir_len) == 0) {
+ dirname = lastdir;
+ dirname_len = 0; /* indicates no copy is needed */
+ } else
+ dirname = thisname;
+ } else {
+ basename = thisname;
+ dirname = NULL;
+ dirname_len = 0;
+ }
+ basename_len = strlen(basename) + 1; /* count the '\0' */
+
+ file_length = read_longint(f);
+ if (!(flags & XMIT_SAME_TIME))
+ modtime = (time_t)read_int(f);
+ if (!(flags & XMIT_SAME_MODE))
+ mode = from_wire_mode(read_int(f));
+
+ if (preserve_uid && !(flags & XMIT_SAME_UID))
+ uid = (uid_t)read_int(f);
+ if (preserve_gid && !(flags & XMIT_SAME_GID))
+ gid = (gid_t)read_int(f);
+
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ if (IS_DEVICE(mode)) {
+ if (!(flags & XMIT_SAME_RDEV_pre28))
+ rdev = (dev_t)read_int(f);
+ } else
+ rdev = makedev(0, 0);
+ } else if (IS_DEVICE(mode)) {
+ uint32 rdev_minor;
+ if (!(flags & XMIT_SAME_RDEV_MAJOR))
+ rdev_major = read_int(f);
+ if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+ rdev_minor = read_byte(f);
+ else
+ rdev_minor = read_int(f);
+ rdev = makedev(rdev_major, rdev_minor);
+ }
}
- if ((p = strrchr(thisname, '/'))) {
- static char *lastdir;
- *p = 0;
- if (lastdir && strcmp(thisname, lastdir) == 0) {
- file->dirname = lastdir;
- } else {
- file->dirname = strdup(thisname);
- lastdir = file->dirname;
+#if SUPPORT_LINKS
+ if (preserve_links && S_ISLNK(mode)) {
+ linkname_len = read_int(f) + 1; /* count the '\0' */
+ if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
+ rprintf(FERROR, "overflow: linkname_len=%d\n",
+ linkname_len - 1);
+ overflow("receive_file_entry");
}
- file->basename = strdup(p + 1);
- } else {
- file->dirname = NULL;
- file->basename = strdup(thisname);
}
+ else
+#endif
+ linkname_len = 0;
- if (!file->basename)
- out_of_memory("receive_file_entry 1");
+ sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len;
+ bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
- 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 (preserve_links && S_ISLNK(file->mode)) {
- int l = read_int(f);
- if (l < 0) {
- rprintf(FERROR, "overflow: l=%d\n", l);
- overflow("receive_file_entry");
- }
- file->link = (char *) malloc(l + 1);
- if (!file->link)
- out_of_memory("receive_file_entry 2");
- read_sbuf(f, file->link, l);
- if (sanitize_paths) {
- sanitize_path(file->link, file->dirname);
- }
+ file = *fptr = (struct file_struct *)bp;
+ memset(bp, 0, file_struct_len);
+ bp += file_struct_len;
+
+ file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->modtime = modtime;
+ file->length = file_length;
+ file->mode = mode;
+ file->uid = uid;
+ file->gid = gid;
+
+ if (dirname_len) {
+ file->dirname = lastdir = bp;
+ lastdir_len = dirname_len - 1;
+ memcpy(bp, dirname, dirname_len - 1);
+ bp += dirname_len;
+ bp[-1] = '\0';
+ } else if (dirname)
+ file->dirname = dirname;
+
+ file->basename = bp;
+ memcpy(bp, basename, basename_len);
+ bp += basename_len;
+
+ if (preserve_devices && IS_DEVICE(mode))
+ file->u.rdev = rdev;
+
+#if SUPPORT_LINKS
+ if (linkname_len) {
+ file->u.link = bp;
+ read_sbuf(f, bp, linkname_len - 1);
+ if (sanitize_paths)
+ sanitize_path(bp, lastdir);
+ bp += linkname_len;
}
+#endif
+
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
- file->dev = read_int(f);
- file->inode = read_int(f);
+ if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
+ flags |= XMIT_HAS_IDEV_DATA;
+ if (flags & XMIT_HAS_IDEV_DATA) {
+ uint64 inode;
+ if (protocol_version < 26) {
+ dev = read_int(f);
+ inode = read_int(f);
} else {
- file->dev = read_longint(f);
- file->inode = read_longint(f);
+ if (!(flags & XMIT_SAME_DEV))
+ dev = read_longint(f);
+ inode = read_longint(f);
+ }
+ if (flist->hlink_pool) {
+ file->link_u.idev = pool_talloc(flist->hlink_pool,
+ struct idev, 1, "inode_table");
+ file->F_INODE = inode;
+ file->F_DEV = dev;
}
}
#endif
if (always_checksum) {
- file->sum = (char *) malloc(MD4_SUM_LENGTH);
- if (!file->sum)
- out_of_memory("md4 sum");
- if (remote_version < 21) {
- read_buf(f, file->sum, 2);
- } else {
- read_buf(f, file->sum, MD4_SUM_LENGTH);
+ char *sum;
+ if (sum_len) {
+ file->u.sum = sum = bp;
+ /*bp += sum_len;*/
+ } 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);
}
}
- 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
- permissions and umask. This emulates what GNU cp does */
+ * permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
}
}
-/* determine if a file in a different filesstem should be skipped
- when one_file_system is set. We bascally only want to include
- the mount points - but they can be hard to find! */
-static int skip_filesystem(char *fname, STRUCT_STAT * st)
-{
- STRUCT_STAT st2;
- char *p = strrchr(fname, '/');
-
- /* skip all but directories */
- if (!S_ISDIR(st->st_mode))
- return 1;
-
- /* if its not a subdirectory then allow */
- if (!p)
- return 0;
-
- *p = 0;
- if (link_stat(fname, &st2)) {
- *p = '/';
- return 0;
- }
- *p = '/';
-
- return (st2.st_dev != filesystem_dev);
-}
-
-#define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p))
-/* IRIX cc cares that the operands to the ternary have the same type. */
-#define MALLOC(ap, i) (ap ? (void*) string_area_malloc(ap, i) : malloc(i))
-
/**
* Create a file_struct for a named file by reading its stat()
* information and performing extensive checks against global
* statting directories if we're not recursing, but this is not a very
* important case. Some systems may not have d_type.
**/
-struct file_struct *make_file(char *fname, struct string_area **ap,
+struct file_struct *make_file(char *fname, struct file_list *flist,
int exclude_level)
{
+ static char *lastdir;
+ static int lastdir_len = -1;
struct file_struct *file;
STRUCT_STAT st;
char sum[SUM_LENGTH];
- char *p;
- char cleaned_name[MAXPATHLEN];
- char linkbuf[MAXPATHLEN];
- extern int module_id;
-
- strlcpy(cleaned_name, fname, MAXPATHLEN);
- cleaned_name[MAXPATHLEN - 1] = 0;
- clean_fname(cleaned_name);
- if (sanitize_paths) {
- sanitize_path(cleaned_name, NULL);
+ char thisname[MAXPATHLEN];
+ char linkname[MAXPATHLEN];
+ int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ char *basename, *dirname, *bp;
+ unsigned short flags = 0;
+
+ if (!flist || !flist->count) /* Ignore lastdir when invalid. */
+ lastdir_len = -1;
+
+ if (strlcpy(thisname, fname, sizeof thisname)
+ >= sizeof thisname - flist_dir_len) {
+ rprintf(FINFO, "skipping overly long name: %s\n", fname);
+ return NULL;
}
- fname = cleaned_name;
+ clean_fname(thisname);
+ if (sanitize_paths)
+ sanitize_path(thisname, NULL);
memset(sum, 0, SUM_LENGTH);
- if (readlink_stat(fname, &st, linkbuf) != 0) {
+ if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
- if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
- /* either symlink pointing nowhere or file that
- * was removed during rsync run; see if excluded
- * before reporting an error */
- if (check_exclude_file(fname, 0, exclude_level)) {
- /* file is excluded anyway, ignore silently */
- return NULL;
+ /* See if file is excluded before reporting an error. */
+ if (exclude_level != NO_EXCLUDES
+ && check_exclude_file(thisname, 0, exclude_level))
+ return NULL;
+ if (save_errno == ENOENT) {
+#if SUPPORT_LINKS
+ /* Avoid "vanished" error if symlink points nowhere. */
+ if (copy_links && do_lstat(thisname, &st) == 0
+ && S_ISLNK(st.st_mode)) {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "symlink has no referent: %s\n",
+ full_fname(thisname));
+ } else
+#endif
+ {
+ enum logcode c = am_daemon && protocol_version < 28
+ ? FERROR : FINFO;
+ io_error |= IOERR_VANISHED;
+ rprintf(c, "file has vanished: %s\n",
+ full_fname(thisname));
}
+ } else {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, save_errno, "readlink %s failed",
+ full_fname(thisname));
}
- io_error = 1;
- rprintf(FERROR, "readlink %s: %s\n",
- fname, strerror(save_errno));
return NULL;
}
goto skip_excludes;
if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
- rprintf(FINFO, "skipping directory %s\n", fname);
+ rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
- if (one_file_system && st.st_dev != filesystem_dev) {
- if (skip_filesystem(fname, &st))
- 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(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
+ if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
return NULL;
- if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
+ if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
return NULL;
- skip_excludes:
+skip_excludes:
- if (verbose > 2)
- rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+ who_am_i(), thisname, exclude_level);
+ }
- file = (struct file_struct *) malloc(sizeof(*file));
- if (!file)
- out_of_memory("make_file");
- memset((char *) file, 0, sizeof(*file));
-
- if ((p = strrchr(fname, '/'))) {
- static char *lastdir;
- *p = 0;
- if (lastdir && strcmp(fname, lastdir) == 0) {
- file->dirname = lastdir;
- } else {
- file->dirname = strdup(fname);
- lastdir = file->dirname;
- }
- file->basename = STRDUP(ap, p + 1);
- *p = '/';
+ if ((basename = strrchr(thisname, '/')) != NULL) {
+ dirname_len = ++basename - thisname; /* counts future '\0' */
+ if (lastdir_len == dirname_len - 1
+ && strncmp(thisname, lastdir, lastdir_len) == 0) {
+ dirname = lastdir;
+ dirname_len = 0; /* indicates no copy is needed */
+ } else
+ dirname = thisname;
} else {
- file->dirname = NULL;
- file->basename = STRDUP(ap, fname);
+ basename = thisname;
+ dirname = NULL;
+ dirname_len = 0;
}
+ basename_len = strlen(basename) + 1; /* count the '\0' */
+
+#if SUPPORT_LINKS
+ linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
+#else
+ linkname_len = 0;
+#endif
+ sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len;
+ if (flist) {
+ bp = pool_alloc(flist->file_pool, alloc_len,
+ "receive_file_entry");
+ } else {
+ if (!(bp = new_array(char, alloc_len)))
+ out_of_memory("receive_file_entry");
+ }
+
+ file = (struct file_struct *)bp;
+ memset(bp, 0, file_struct_len);
+ bp += file_struct_len;
+
+ file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
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 SUPPORT_HARD_LINKS
+ if (flist && flist->hlink_pool) {
+ if (protocol_version < 28) {
+ if (S_ISREG(st.st_mode))
+ file->link_u.idev = pool_talloc(
+ flist->hlink_pool, struct idev, 1,
+ "inode_table");
+ } else {
+ if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+ file->link_u.idev = pool_talloc(
+ flist->hlink_pool, struct idev, 1,
+ "inode_table");
+ }
+ }
+ if (file->link_u.idev) {
+ 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;
+ memcpy(bp, dirname, dirname_len - 1);
+ bp += dirname_len;
+ bp[-1] = '\0';
+ } else if (dirname)
+ file->dirname = dirname;
+
+ file->basename = bp;
+ memcpy(bp, basename, basename_len);
+ bp += basename_len;
+
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- file->rdev = st.st_rdev;
+ if (preserve_devices && 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);
+ if (linkname_len) {
+ file->u.link = bp;
+ memcpy(bp, linkname, linkname_len);
+ bp += linkname_len;
}
#endif
- if (always_checksum) {
- 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);
- }
+ if (sum_len) {
+ file->u.sum = bp;
+ file_checksum(thisname, bp, st.st_size);
+ /*bp += sum_len;*/
}
- if (flist_dir) {
- static char *lastdir;
- if (lastdir && strcmp(lastdir, flist_dir) == 0) {
- file->basedir = lastdir;
- } else {
- file->basedir = strdup(flist_dir);
- lastdir = file->basedir;
- }
- } else {
- file->basedir = NULL;
- }
+ file->basedir = flist_dir;
if (!S_ISDIR(st.st_mode))
stats.total_size += st.st_size;
}
-
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;
- extern int delete_excluded;
+ char fbuf[MAXPATHLEN];
/* f is set to -1 when calculating deletion file list */
- file = make_file(fname, &flist->string_area,
- f == -1 && delete_excluded? SERVER_EXCLUDES
- : ALL_EXCLUDES);
+ file = make_file(fname, flist,
+ f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES);
if (!file)
return;
flist_expand(flist);
- if (write_batch) /* dw */
- file->flags = FLAG_DELETE;
+ if (write_batch)
+ file->flags |= FLAG_TOP_DIR;
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
}
- if (S_ISDIR(file->mode) && recursive) {
- struct exclude_struct **last_exclude_list =
- local_exclude_list;
- send_directory(f, flist, f_name(file));
- local_exclude_list = last_exclude_list;
- return;
+ if (recursive && S_ISDIR(file->mode)
+ && !(file->flags & FLAG_MOUNT_POINT)) {
+ struct exclude_list_struct last_list = local_exclude_list;
+ local_exclude_list.head = local_exclude_list.tail = NULL;
+ send_directory(f, flist, f_name_to(file, fbuf));
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] popping %sexclude list\n",
+ who_am_i(), local_exclude_list.debug_type);
+ }
+ clear_exclude_list(&local_exclude_list);
+ local_exclude_list = last_list;
}
}
-
static void send_directory(int f, struct file_list *flist, char *dir)
{
DIR *d;
struct dirent *di;
char fname[MAXPATHLEN];
- int l;
+ unsigned int offset;
char *p;
d = opendir(dir);
if (!d) {
- io_error = 1;
- rprintf(FERROR, "opendir(%s): %s\n", dir, strerror(errno));
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir));
return;
}
- strlcpy(fname, dir, MAXPATHLEN);
- l = strlen(fname);
- if (fname[l - 1] != '/') {
- if (l == MAXPATHLEN - 1) {
- io_error = 1;
- rprintf(FERROR,
- "skipping long-named directory %s\n",
- fname);
+ offset = strlcpy(fname, dir, MAXPATHLEN);
+ p = fname + offset;
+ if (offset >= MAXPATHLEN || p[-1] != '/') {
+ if (offset >= MAXPATHLEN - 1) {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "skipping long-named directory: %s\n",
+ full_fname(fname));
closedir(d);
return;
}
- strlcat(fname, "/", MAXPATHLEN);
- l++;
+ *p++ = '/';
+ offset++;
}
- p = fname + strlen(fname);
-
- local_exclude_list = NULL;
if (cvs_exclude) {
- if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
- strcpy(p, ".cvsignore");
- add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
+ if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+ < MAXPATHLEN - offset) {
+ add_exclude_file(&local_exclude_list, fname,
+ XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
} else {
- io_error = 1;
+ io_error |= IOERR_GENERAL;
rprintf(FINFO,
"cannot cvs-exclude in long-named directory %s\n",
- fname);
+ full_fname(fname));
}
}
- for (di = readdir(d); di; di = readdir(d)) {
+ for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
- if (dname[0] == '.' && (dname[1] == '\0' ||
- (dname[1] == '.' && dname[2] == '\0')))
+ if (dname[0] == '.' && (dname[1] == '\0'
+ || (dname[1] == '.' && dname[2] == '\0')))
continue;
- strlcpy(p, dname, MAXPATHLEN - l);
- send_file_name(f, flist, fname, recurse, 0);
+ if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
+ send_file_name(f, flist, fname, recurse, 0);
+ else {
+ io_error |= IOERR_GENERAL;
+ rprintf(FINFO,
+ "cannot send long-named file %s\n",
+ full_fname(fname));
+ }
+ }
+ if (errno) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "readdir(%s)", dir);
}
-
- if (local_exclude_list)
- free_exclude_list(&local_exclude_list); /* Zeros pointer too */
closedir(d);
}
/**
+ * This function is normally called by the sender, but the receiver also
+ * uses it to construct its own file list if --delete has been specified.
* The delete_files() function in receiver.c sets f to -1 so that we just
* construct the file list in memory without sending it over the wire. It
* also has the side-effect of ignoring user-excludes if delete_excluded
{
int l;
STRUCT_STAT st;
- char *p, *dir, *olddir;
+ char *p, *dir, olddir[sizeof curr_dir];
char lastpath[MAXPATHLEN] = "";
struct file_list *flist;
int64 start_write;
start_write = stats.total_written;
- flist = flist_new();
+ flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
+ "send_file_list");
if (f != -1) {
- io_start_buffering(f);
+ io_start_buffering_out(f);
if (filesfrom_fd >= 0) {
- if (argv[0] && !push_dir(argv[0], 0)) {
- rprintf(FERROR, "push_dir %s : %s\n",
- argv[0], strerror(errno));
+ if (argv[0] && !push_dir(argv[0])) {
+ rsyserr(FERROR, errno, "push_dir %s failed",
+ full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
}
use_ff_fd = 1;
}
l = strlen(fname);
- if (l != 1 && fname[l - 1] == '/') {
- if ((l == 2) && (fname[0] == '.')) {
- /* Turn ./ into just . rather than ./.
- This was put in to avoid a problem with
- rsync -aR --delete from ./
- The send_file_name() below of ./ was
- mysteriously preventing deletes */
- fname[1] = 0;
- } else {
- strlcat(fname, ".", MAXPATHLEN);
+ if (fname[l - 1] == '/') {
+ if (l == 2 && fname[0] == '.') {
+ /* Turn "./" into just "." rather than "./." */
+ fname[1] = '\0';
+ } else if (l < MAXPATHLEN) {
+ fname[l++] = '.';
+ fname[l] = '\0';
}
}
- if (link_stat(fname, &st) != 0) {
+ if (link_stat(fname, &st, keep_dirlinks) != 0) {
if (f != -1) {
- io_error = 1;
- rprintf(FERROR, "link_stat %s : %s\n",
- fname, strerror(errno));
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "link_stat %s failed",
+ full_fname(fname));
}
continue;
}
}
dir = NULL;
- olddir = NULL;
+ olddir[0] = '\0';
if (!relative_paths) {
p = strrchr(fname, '/');
fname = ".";
if (dir && *dir) {
- olddir = push_dir(dir, 1);
+ static char *lastdir;
+ static int lastdir_len;
- if (!olddir) {
- io_error = 1;
- rprintf(FERROR, "push_dir %s : %s\n",
- dir, strerror(errno));
+ strcpy(olddir, curr_dir); /* can't overflow */
+
+ if (!push_dir(dir)) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "push_dir %s failed",
+ full_fname(dir));
continue;
}
- flist_dir = dir;
+ if (lastdir && strcmp(lastdir, dir) == 0) {
+ flist_dir = lastdir;
+ flist_dir_len = lastdir_len;
+ } else {
+ flist_dir = lastdir = strdup(dir);
+ flist_dir_len = lastdir_len = strlen(dir);
+ }
}
if (one_file_system)
set_filesystem(fname);
- send_file_name(f, flist, fname, recurse, FLAG_DELETE);
+ send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
- if (olddir != NULL) {
+ if (olddir[0]) {
flist_dir = NULL;
- if (pop_dir(olddir) != 0) {
- rprintf(FERROR, "pop_dir %s : %s\n",
- dir, strerror(errno));
+ flist_dir_len = 0;
+ if (!pop_dir(olddir)) {
+ rsyserr(FERROR, errno, "pop_dir %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
}
if (f != -1) {
send_file_entry(NULL, f, 0);
+
+ if (show_filelist_p())
+ finish_filelist_progress(flist);
}
- if (show_filelist_p() && f != -1) {
- finish_filelist_progress(flist);
+ if (flist->hlink_pool) {
+ pool_destroy(flist->hlink_pool);
+ flist->hlink_pool = NULL;
}
clean_flist(flist, 0, 0);
- /* now send the uid/gid list. This was introduced in protocol
- version 15 */
if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
send_uid_list(f);
- }
- /* send the io_error flag */
- if (f != -1) {
- extern int module_id;
+ /* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
- }
- if (f != -1) {
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
- if (write_batch) /* dw */
+ if (write_batch)
write_batch_flist_info(flist->count, flist->files);
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
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;
if (show_filelist_p())
start_filelist_progress("receiving file list");
start_read = stats.total_read;
- flist = (struct file_list *) malloc(sizeof(flist[0]));
- if (!flist)
- goto oom;
+ flist = flist_new(WITH_HLINK, "recv_file_list");
flist->count = 0;
flist->malloced = 1000;
- flist->files =
- (struct file_struct **) malloc(sizeof(flist->files[0]) *
- flist->malloced);
+ flist->files = new_array(struct file_struct *, flist->malloced);
if (!flist->files)
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);
- receive_file_entry(&flist->files[i], flags, f);
+ if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
+ flags |= read_byte(f) << 8;
+ receive_file_entry(&flist->files[i], flags, flist, f);
if (S_ISREG(flist->files[i]->mode))
stats.total_size += flist->files[i]->length;
maybe_emit_filelist_progress(flist);
- if (verbose > 2)
+ if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(flist->files[i]));
+ }
}
-
+ receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
- clean_flist(flist, relative_paths, 1);
-
- if (show_filelist_p()) {
+ if (show_filelist_p())
finish_filelist_progress(flist);
- }
- /* now recv the uid/gid list. This was introduced in protocol version 15 */
+ clean_flist(flist, relative_paths, 1);
+
if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
recv_uid_list(f, flist);
- }
- /* recv the io_error flag */
- if (f != -1 && !read_batch) { /* dw-added readbatch */
- extern int module_id;
- extern int ignore_errors;
- if (lp_ignore_errors(module_id) || ignore_errors) {
- read_int(f);
- } else {
- io_error |= read_int(f);
+ if (!read_batch) {
+ /* Recv the io_error flag */
+ if (lp_ignore_errors(module_id) || ignore_errors)
+ read_int(f);
+ else
+ io_error |= read_int(f);
}
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (list_only) {
int i;
- for (i = 0; i < flist->count; i++) {
+ for (i = 0; i < flist->count; i++)
list_file_entry(flist->files[i]);
- }
}
-
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");
return flist;
- oom:
+oom:
out_of_memory("recv_file_list");
return NULL; /* not reached */
}
-/*
- * XXX: This is currently the hottest function while building the file
- * list, because building f_name()s every time is expensive.
- **/
-int file_compare(struct file_struct **f1, struct file_struct **f2)
+int file_compare(struct file_struct **file1, struct file_struct **file2)
{
- if (!(*f1)->basename && !(*f2)->basename)
+ struct file_struct *f1 = *file1;
+ struct file_struct *f2 = *file2;
+
+ if (!f1->basename && !f2->basename)
return 0;
- if (!(*f1)->basename)
+ if (!f1->basename)
return -1;
- if (!(*f2)->basename)
+ if (!f2->basename)
return 1;
- if ((*f1)->dirname == (*f2)->dirname)
- return u_strcmp((*f1)->basename, (*f2)->basename);
- return u_strcmp(f_name(*f1), f_name(*f2));
+ if (f1->dirname == f2->dirname)
+ return u_strcmp(f1->basename, f2->basename);
+ return f_name_cmp(f1, f2);
}
while (low != high) {
int mid = (low + high) / 2;
- int ret =
- file_compare(&flist->files[flist_up(flist, mid)], &f);
+ int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
if (ret == 0)
return flist_up(flist, mid);
- if (ret > 0) {
+ if (ret > 0)
high = mid;
- } else {
+ else
low = mid + 1;
- }
}
if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
return -1;
}
-
/*
- * free up one file
+ * Free up any resources a file_struct has allocated
+ * and clear the file.
*/
-void free_file(struct file_struct *file)
+void clear_file(int i, struct file_list *flist)
{
- if (!file)
- return;
- if (file->basename)
- free(file->basename);
- if (file->link)
- free(file->link);
- if (file->sum)
- free(file->sum);
- *file = null_file;
+ if (flist->hlink_pool && flist->files[i]->link_u.idev)
+ pool_free(flist->hlink_pool, 0, flist->files[i]->link_u.idev);
+ memset(flist->files[i], 0, file_struct_len);
}
/*
* allocate a new file list
*/
-struct file_list *flist_new(void)
+struct file_list *flist_new(int with_hlink, char *msg)
{
struct file_list *flist;
- flist = (struct file_list *) malloc(sizeof(flist[0]));
+ flist = new(struct file_list);
if (!flist)
- out_of_memory("send_file_list");
+ out_of_memory(msg);
- flist->count = 0;
- flist->malloced = 0;
- flist->files = NULL;
+ memset(flist, 0, sizeof (struct file_list));
-#if ARENA_SIZE > 0
- flist->string_area = string_area_new(0);
-#else
- flist->string_area = NULL;
+ if (!(flist->file_pool = pool_create(FILE_EXTENT, 0,
+ out_of_memory, POOL_INTERN)))
+ out_of_memory(msg);
+
+#if SUPPORT_HARD_LINKS
+ if (with_hlink && preserve_hard_links) {
+ if (!(flist->hlink_pool = pool_create(HLINK_EXTENT,
+ sizeof (struct idev), out_of_memory, POOL_INTERN)))
+ out_of_memory(msg);
+ }
#endif
+
return flist;
}
*/
void flist_free(struct file_list *flist)
{
- int i;
- for (i = 1; i < flist->count; i++) {
- if (!flist->string_area)
- free_file(flist->files[i]);
- free(flist->files[i]);
- }
- /* FIXME: I don't think we generally need to blank the flist
- * since it's about to be freed. This will just cause more
- * memory traffic. If you want a freed-memory debugger, you
- * know where to get it. */
- memset((char *) flist->files, 0,
- sizeof(flist->files[0]) * flist->count);
+ pool_destroy(flist->file_pool);
+ pool_destroy(flist->hlink_pool);
free(flist->files);
- if (flist->string_area)
- string_area_free(flist->string_area);
- memset((char *) flist, 0, sizeof(*flist));
free(flist);
}
*/
static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
{
- int i;
- char *name, *prev_name = NULL;
+ int i, prev_i = 0;
if (!flist || flist->count == 0)
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) {
- prev_name = f_name(flist->files[i]);
+ prev_i = i;
break;
}
}
while (++i < flist->count) {
if (!flist->files[i]->basename)
continue;
- name = f_name(flist->files[i]);
- if (strcmp(name, prev_name) == 0) {
+ if (f_name_cmp(flist->files[i], flist->files[prev_i]) == 0) {
if (verbose > 1 && !am_server) {
rprintf(FINFO,
"removing duplicate name %s from file list %d\n",
- name, i);
+ f_name(flist->files[i]), i);
}
- /* it's not great that the flist knows the semantics of
- * the file memory usage, but i'd rather not add a flag
- * byte to that struct.
- * XXX can i use a bit in the flags field? */
- if (flist->string_area)
- flist->files[i][0] = null_file;
- else
- free_file(flist->files[i]);
- }
- prev_name = name;
+ /* Make sure that if we unduplicate '.', that we don't
+ * lose track of a user-specified starting point (or
+ * else deletions will mysteriously fail with -R). */
+ if (flist->files[i]->flags & FLAG_TOP_DIR)
+ flist->files[prev_i]->flags |= FLAG_TOP_DIR;
+
+ clear_file(i, flist);
+ } else
+ prev_i = i;
}
if (strip_root) {
}
}
}
+}
- 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, "[%d] i=%d %s %s mode=0%o len=%.0f\n",
- (int) getpid(), i,
- 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);
}
}
-/*
- * return the full filename of a flist entry
- *
- * This function is too expensive at the moment, because it copies
- * strings when often we only want to compare them. In any case,
- * using strlcat is silly because it will walk the string repeatedly.
+enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
+
+/* Compare the names of two file_struct entities, just like strcmp()
+ * would do if it were operating on the joined strings. We assume
+ * that there are no 0-length strings.
*/
-char *f_name(struct file_struct *f)
+int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
{
- static char names[10][MAXPATHLEN];
- static int n;
- char *p = names[n];
+ int dif;
+ const uchar *c1, *c2;
+ enum fnc_state state1, state2;
+ if (!f1 || !f1->basename) {
+ if (!f2 || !f2->basename)
+ return 0;
+ return -1;
+ }
+ if (!f2 || !f2->basename)
+ return 1;
+
+ if (!(c1 = (uchar*)f1->dirname)) {
+ state1 = fnc_BASE;
+ c1 = (uchar*)f1->basename;
+ } else if (!*c1) {
+ state1 = fnc_SLASH;
+ c1 = (uchar*)"/";
+ } else
+ state1 = fnc_DIR;
+ if (!(c2 = (uchar*)f2->dirname)) {
+ state2 = fnc_BASE;
+ c2 = (uchar*)f2->basename;
+ } else if (!*c2) {
+ state2 = fnc_SLASH;
+ c2 = (uchar*)"/";
+ } else
+ state2 = fnc_DIR;
+
+ while (1) {
+ if ((dif = (int)*c1 - (int)*c2) != 0)
+ break;
+ if (!*++c1) {
+ switch (state1) {
+ case fnc_DIR:
+ state1 = fnc_SLASH;
+ c1 = (uchar*)"/";
+ break;
+ case fnc_SLASH:
+ state1 = fnc_BASE;
+ c1 = (uchar*)f1->basename;
+ break;
+ case fnc_BASE:
+ break;
+ }
+ }
+ if (!*++c2) {
+ switch (state2) {
+ case fnc_DIR:
+ state2 = fnc_SLASH;
+ c2 = (uchar*)"/";
+ break;
+ case fnc_SLASH:
+ state2 = fnc_BASE;
+ c2 = (uchar*)f2->basename;
+ break;
+ case fnc_BASE:
+ if (!*c1)
+ return 0;
+ break;
+ }
+ }
+ }
+
+ return dif;
+}
+
+
+/* Return a copy of the full filename of a flist entry, using the indicated
+ * buffer. No size-checking is done because we checked the size when creating
+ * the file_struct entry.
+ */
+char *f_name_to(struct file_struct *f, char *fbuf)
+{
if (!f || !f->basename)
return NULL;
- n = (n + 1) % 10;
-
if (f->dirname) {
- int off;
+ int len = strlen(f->dirname);
+ memcpy(fbuf, f->dirname, len);
+ fbuf[len] = '/';
+ strcpy(fbuf + len + 1, f->basename);
+ } else
+ strcpy(fbuf, f->basename);
+ return fbuf;
+}
- off = strlcpy(p, f->dirname, MAXPATHLEN);
- off += strlcpy(p + off, "/", MAXPATHLEN - off);
- off += strlcpy(p + off, f->basename, MAXPATHLEN - off);
- } else {
- strlcpy(p, f->basename, MAXPATHLEN);
- }
- return p;
+/* Like f_name_to(), but we rotate through 5 static buffers of our own.
+ */
+char *f_name(struct file_struct *f)
+{
+ static char names[5][MAXPATHLEN];
+ static unsigned int n;
+
+ n = (n + 1) % (sizeof names / sizeof names[0]);
+
+ return f_name_to(f, names[n]);
}
git.samba.org / rsync.git / blobdiff