X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9312b7325eed2a1e4d5824cb06497631cea07cd4..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/flist.c diff --git a/flist.c b/flist.c index 6604ff79..19931a5f 100644 --- a/flist.c +++ b/flist.c @@ -31,10 +31,12 @@ extern struct stats stats; 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; @@ -69,8 +71,18 @@ extern struct exclude_struct **local_exclude_list; int io_error; 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 = ((char*)&f.flags - (char*)&f) + sizeof f.flags; +} static int show_filelist_p(void) @@ -266,38 +278,45 @@ 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) { - 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) @@ -424,11 +443,13 @@ 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)) { @@ -485,7 +506,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) -void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f) +void receive_file_entry(struct file_struct **fptr, unsigned short flags, + struct file_list *flist, int f) { static time_t modtime; static mode_t mode; @@ -593,13 +615,13 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f) sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0; - alloc_len = sizeof file[0] + dirname_len + basename_len + alloc_len = file_struct_len + dirname_len + basename_len + linkname_len + sum_len; - if (!(bp = new_array(char, alloc_len))) - out_of_memory("receive_file_entry"); + bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry"); + file = *fptr = (struct file_struct *)bp; - memset(bp, 0, sizeof file[0]); - bp += sizeof file[0]; + memset(bp, 0, file_struct_len); + bp += file_struct_len; file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0; file->modtime = modtime; @@ -637,18 +659,22 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f) #if SUPPORT_HARD_LINKS if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode)) flags |= XMIT_HAS_IDEV_DATA; - if (flags & XMIT_HAS_IDEV_DATA) { - if (!(file->link_u.idev = new(struct idev))) - out_of_memory("file inode data"); + if (flags & XMIT_HAS_IDEV_DATA && flist->hlink_pool) { + INO64_T inode; + file->link_u.idev = pool_talloc(flist->hlink_pool, + struct idev, 1, "inode_table"); if (protocol_version < 26) { dev = read_int(f); - file->F_INODE = read_int(f); + inode = read_int(f); } else { if (!(flags & XMIT_SAME_DEV)) dev = read_longint(f); - file->F_INODE = read_longint(f); + inode = read_longint(f); + } + if (flist->hlink_pool) { + file->F_INODE = inode; + file->F_DEV = dev; } - file->F_DEV = dev; } #endif @@ -692,7 +718,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f) * 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, int exclude_level) +struct file_struct *make_file(char *fname, + struct file_list *flist, int exclude_level) { static char *lastdir; static int lastdir_len = -1; @@ -705,6 +732,7 @@ struct file_struct *make_file(char *fname, int exclude_level) char *basename, *dirname, *bp; unsigned short flags = 0; + if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname - flist_dir_len) { rprintf(FINFO, "skipping overly long name: %s\n", fname); @@ -742,13 +770,12 @@ struct file_struct *make_file(char *fname, int exclude_level) 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; @@ -786,13 +813,19 @@ struct file_struct *make_file(char *fname, int exclude_level) sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0; - alloc_len = sizeof file[0] + dirname_len + basename_len - + linkname_len + sum_len; - if (!(bp = new_array(char, alloc_len))) - out_of_memory("receive_file_entry"); + 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, sizeof file[0]); - bp += sizeof file[0]; + memset(bp, 0, file_struct_len); + bp += file_struct_len; file->flags = flags; file->modtime = st.st_mtime; @@ -801,6 +834,26 @@ struct file_struct *make_file(char *fname, int exclude_level) file->uid = st.st_uid; file->gid = st.st_gid; +#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; @@ -827,18 +880,6 @@ struct file_struct *make_file(char *fname, int exclude_level) } #endif -#if SUPPORT_HARD_LINKS - if (preserve_hard_links) { - if (protocol_version < 28 ? S_ISREG(st.st_mode) - : !S_ISDIR(st.st_mode) && st.st_nlink > 1) { - if (!(file->link_u.idev = new(struct idev))) - out_of_memory("file inode data"); - 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); @@ -862,9 +903,8 @@ void send_file_name(int f, struct file_list *flist, char *fname, extern int delete_excluded; /* f is set to -1 when calculating deletion file list */ - file = make_file(fname, - f == -1 && delete_excluded? SERVER_EXCLUDES - : ALL_EXCLUDES); + file = make_file(fname, flist, + f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES); if (!file) return; @@ -983,7 +1023,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) 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_out(f); @@ -1134,6 +1175,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) finish_filelist_progress(flist); } + if (flist->hlink_pool) + { + pool_destroy(flist->hlink_pool); + flist->hlink_pool = NULL; + } + clean_flist(flist, 0, 0); if (f != -1) { @@ -1151,6 +1198,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) write_batch_flist_info(flist->count, flist->files); } + if (verbose > 3) + output_flist(flist); + if (verbose > 2) rprintf(FINFO, "send_file_list done\n"); @@ -1170,9 +1220,7 @@ struct file_list *recv_file_list(int f) start_read = stats.total_read; - flist = new(struct file_list); - if (!flist) - goto oom; + flist = flist_new(WITH_HLINK, "recv_file_list"); flist->count = 0; flist->malloced = 1000; @@ -1188,7 +1236,7 @@ struct file_list *recv_file_list(int f) if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS)) flags |= read_byte(f) << 8; - receive_file_entry(&flist->files[i], flags, f); + receive_file_entry(&flist->files[i], flags, flist, f); if (S_ISREG(flist->files[i]->mode)) stats.total_size += flist->files[i]->length; @@ -1202,7 +1250,7 @@ struct file_list *recv_file_list(int f) f_name(flist->files[i])); } } - receive_file_entry(NULL, 0, 0); /* Signal that we're done. */ + receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */ if (verbose > 2) rprintf(FINFO, "received %d names\n", flist->count); @@ -1226,6 +1274,9 @@ struct file_list *recv_file_list(int f) } } + if (verbose > 3) + output_flist(flist); + if (list_only) { int i; for (i = 0; i < flist->count; i++) @@ -1288,38 +1339,42 @@ int flist_find(struct file_list *flist, struct file_struct *f) return -1; } - /* - * Free up any resources a file_struct has allocated, and optionally free - * it up as well. + * Free up any resources a file_struct has allocated + * and clear the file. */ -void free_file(struct file_struct *file, int free_the_struct) +void clear_file(int i, struct file_list *flist) { -#if SUPPORT_HARD_LINKS - if (file->link_u.idev) - free((char*)file->link_u.idev); /* Handles link_u.links too. */ -#endif - if (free_the_struct) - free(file); - else - memset(file, 0, sizeof file[0]); + 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 = 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 (!(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; } @@ -1329,9 +1384,8 @@ struct file_list *flist_new(void) */ void flist_free(struct file_list *flist) { - int i; - for (i = 1; i < flist->count; i++) - free_file(flist->files[i], FREE_STRUCT); + pool_destroy(flist->file_pool); + pool_destroy(flist->hlink_pool); free(flist->files); free(flist); } @@ -1349,7 +1403,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) 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) { @@ -1371,7 +1425,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) * else deletions will mysteriously fail with -R). */ if (flist->files[i]->flags & FLAG_TOP_DIR) flist->files[prev_i]->flags |= FLAG_TOP_DIR; - free_file(flist->files[i], CLEAR_STRUCT); + + clear_file(i, flist); } else prev_i = i; } @@ -1394,18 +1449,28 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } } } +} - 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); } }