X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ab94af5c6f93c3b81af95888197f60522e2eb144..e03dfae507d291785d65f454b50a358a79113cfe:/flist.c diff --git a/flist.c b/flist.c index bb6149e7..843cf9e4 100644 --- a/flist.c +++ b/flist.c @@ -1,6 +1,7 @@ /* Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 + Copyright (C) 2001, 2002 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* generate and receive file lists */ +/** @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. + * + **/ #include "rsync.h" @@ -47,6 +55,9 @@ extern int remote_version; extern int io_error; extern int sanitize_paths; +extern int read_batch; +extern int write_batch; + static char topsrcname[MAXPATHLEN]; static struct exclude_struct **local_exclude_list; @@ -55,6 +66,35 @@ static struct file_struct null_file; static void clean_flist(struct file_list *flist, int strip_root); + +static int show_build_progress_p(void) +{ + extern int do_progress; + + return do_progress && verbose && recurse && !am_server; +} + +/** + * True if we're local, etc, and should emit progress emssages. + **/ +static void emit_build_progress(const struct file_list *flist) +{ + rprintf(FINFO, + " %d files...\r", + flist->count); +} + + +static void finish_build_progress(const struct file_list *flist) +{ + if (verbose && recurse && !am_server) { + /* This overwrites the progress line, if any. */ + rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n", + flist->count); + } +} + + static struct string_area *string_area_new(int size) { struct string_area *a; @@ -108,24 +148,14 @@ static char *string_area_strdup(struct string_area **ap, const char *src) static void list_file_entry(struct file_struct *f) { - char perms[11] = "----------"; - char *perm_map = "rwxrwxrwx"; - int i; + char perms[11]; if (!f->basename) /* this can happen if duplicate names were removed */ return; - for (i=0;i<9;i++) { - if (f->mode & (1<mode)) perms[0] = 'l'; - if (S_ISDIR(f->mode)) perms[0] = 'd'; - if (S_ISBLK(f->mode)) perms[0] = 'b'; - if (S_ISCHR(f->mode)) perms[0] = 'c'; - if (S_ISSOCK(f->mode)) perms[0] = 's'; - if (S_ISFIFO(f->mode)) perms[0] = 'p'; - + permstring(perms, f->mode); + if (preserve_links && S_ISLNK(f->mode)) { rprintf(FINFO,"%s %11.0f %s %s -> %s\n", perms, @@ -182,12 +212,18 @@ int link_stat(const char *Path, STRUCT_STAT *Buffer) This function is used to check if a file should be included/excluded from the list of files based on its name and type etc */ -static int match_file_name(char *fname,STRUCT_STAT *st) +static int check_exclude_file(int f,char *fname,STRUCT_STAT *st) { - if (check_exclude(fname,local_exclude_list,st)) { - return 0; - } - return 1; + extern int delete_excluded; + + /* f is set to -1 when calculating deletion file list */ + if ((f == -1) && delete_excluded) { + return 0; + } + if (check_exclude(fname,local_exclude_list,st)) { + return 1; + } + return 0; } /* used by the one_file_system code */ @@ -297,8 +333,15 @@ static void send_file_entry(struct file_struct *file,int f,unsigned base_flags) #if SUPPORT_HARD_LINKS if (preserve_hard_links && S_ISREG(file->mode)) { - write_int(f,(int)file->dev); - write_int(f,(int)file->inode); + if (remote_version < 26) { + /* 32-bit dev_t and ino_t */ + write_int(f,(int)file->dev); + write_int(f,(int)file->inode); + } else { + /* 64-bit dev_t and ino_t */ + write_longint(f, file->dev); + write_longint(f, file->inode); + } } #endif @@ -409,8 +452,13 @@ static void receive_file_entry(struct file_struct **fptr, #if SUPPORT_HARD_LINKS if (preserve_hard_links && S_ISREG(file->mode)) { - file->dev = read_int(f); - file->inode = read_int(f); + if (remote_version < 26) { + file->dev = read_int(f); + file->inode = read_int(f); + } else { + file->dev = read_longint(f); + file->inode = read_longint(f); + } } #endif @@ -464,7 +512,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT *st) } #define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p)) -#define MALLOC(ap, i) (ap ? string_area_malloc(ap, i) : malloc(i)) +/* 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 */ struct file_struct *make_file(int f, char *fname, struct string_area **ap, @@ -476,7 +525,6 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, char *p; char cleaned_name[MAXPATHLEN]; char linkbuf[MAXPATHLEN]; - extern int delete_excluded; extern int module_id; strlcpy(cleaned_name, fname, MAXPATHLEN); @@ -490,9 +538,18 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, memset(sum,0,SUM_LENGTH); if (readlink_stat(fname,&st,linkbuf) != 0) { + int save_errno = errno; + if ((errno == ENOENT) && copy_links && !noexcludes) { + /* symlink pointing nowhere, see if excluded */ + memset((char *)&st, 0, sizeof(st)); + if (check_exclude_file(f,fname,&st)) { + /* file is excluded anyway, ignore silently */ + return NULL; + } + } io_error = 1; rprintf(FERROR,"readlink %s: %s\n", - fname,strerror(errno)); + fname,strerror(save_errno)); return NULL; } @@ -509,8 +566,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, return NULL; } - /* f is set to -1 when calculating deletion file list */ - if (((f != -1) || !delete_excluded) && !match_file_name(fname,&st)) + if (check_exclude_file(f,fname,&st)) return NULL; @@ -599,7 +655,10 @@ void send_file_name(int f,struct file_list *flist,char *fname, file = make_file(f,fname, &flist->string_area, 0); - if (!file) return; + if (!file) return; + + if (show_build_progress_p() & !(flist->count % 100)) + emit_build_progress(flist); if (flist->count >= flist->malloced) { if (flist->malloced < 1000) @@ -613,6 +672,9 @@ void send_file_name(int f,struct file_list *flist,char *fname, out_of_memory("send_file_name"); } + if (write_batch) /* dw */ + file->flags = FLAG_DELETE; + if (strcmp(file->basename,"")) { flist->files[flist->count++] = file; send_file_entry(file,f,base_flags); @@ -687,6 +749,11 @@ static void send_directory(int f,struct file_list *flist,char *dir) } +/* + * + * I *think* f==-1 means that the list should just be built in memory + * and not transmitted. But who can tell? -- mbp + */ struct file_list *send_file_list(int f,int argc,char *argv[]) { int i,l; @@ -697,7 +764,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) int64 start_write; if (verbose && recurse && !am_server && f != -1) { - rprintf(FINFO,"building file list ... "); + rprintf(FINFO, RSYNC_NAME ": building file list...\n"); if (verbose > 1) rprintf(FINFO, "\n"); rflush(FINFO); @@ -820,8 +887,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) send_file_entry(NULL,f,0); } - if (verbose && recurse && !am_server && f != -1) - rprintf(FINFO,"done\n"); + finish_build_progress(flist); clean_flist(flist, 0); @@ -841,6 +907,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) io_end_buffering(f); stats.flist_size = stats.total_written - start_write; stats.num_files = flist->count; + if (write_batch) /* dw */ + write_batch_flist_info(flist->count, flist->files); } if (verbose > 2) @@ -918,7 +986,7 @@ struct file_list *recv_file_list(int f) } /* if protocol version is >= 17 then recv the io_error flag */ - if (f != -1 && remote_version >= 17) { + if (f != -1 && remote_version >= 17 && !read_batch) { /* dw-added readbatch */ extern int module_id; extern int ignore_errors; if (lp_ignore_errors(module_id) || ignore_errors) { @@ -950,6 +1018,10 @@ oom: } +/* + * 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) { if (!(*f1)->basename && !(*f2)->basename) return 0; @@ -1072,6 +1144,10 @@ static void clean_flist(struct file_list *flist, int strip_root) } } + /* FIXME: There is a bug here when filenames are repeated more + * than once, because we don't handle freed files when doing + * the comparison. */ + if (strip_root) { /* we need to strip off the root directory in the case of relative paths, but this must be done _after_ @@ -1096,10 +1172,10 @@ static void clean_flist(struct file_list *flist, int strip_root) for (i=0;icount;i++) { rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n", - getpid(), i, + (int) getpid(), i, NS(flist->files[i]->dirname), NS(flist->files[i]->basename), - flist->files[i]->mode, + (int) flist->files[i]->mode, (double)flist->files[i]->length); } } @@ -1107,6 +1183,10 @@ static void clean_flist(struct file_list *flist, int strip_root) /* * 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. */ char *f_name(struct file_struct *f) { @@ -1119,9 +1199,11 @@ char *f_name(struct file_struct *f) n = (n+1)%10; if (f->dirname) { - strlcpy(p, f->dirname, MAXPATHLEN); - strlcat(p, "/", MAXPATHLEN); - strlcat(p, f->basename, MAXPATHLEN); + int off; + + 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); }