X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9f125ea7c1a55f8c86b2efe296ba750d7ccb9106..25ff04417e4b4fa0aeb44e0b1576a01021aa1650:/flist.c diff --git a/flist.c b/flist.c index 013c104c..bc247a88 100644 --- a/flist.c +++ b/flist.c @@ -35,16 +35,18 @@ extern int am_root; extern int am_server; extern int am_daemon; extern int am_sender; +extern int delete_during; extern int always_checksum; extern int module_id; extern int ignore_errors; extern int numeric_ids; -extern int cvs_exclude; - extern int recurse; -extern int keep_dirs; +extern int xfer_dirs; extern char curr_dir[MAXPATHLEN]; +extern unsigned int curr_dir_len; +extern char *backup_dir; +extern char *backup_suffix; extern int filesfrom_fd; extern int one_file_system; @@ -57,17 +59,19 @@ extern int preserve_uid; extern int preserve_gid; extern int relative_paths; extern int implied_dirs; +extern int make_backups; +extern int backup_suffix_len; extern int copy_links; extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; extern int delete_excluded; +extern int max_delete; extern int orig_umask; extern int list_only; -extern struct exclude_list_struct exclude_list; -extern struct exclude_list_struct server_exclude_list; -extern struct exclude_list_struct local_exclude_list; +extern struct filter_list_struct filter_list; +extern struct filter_list_struct server_filter_list; int io_error; @@ -89,7 +93,7 @@ void init_flist(void) static int show_filelist_p(void) { - return verbose && keep_dirs && !am_server; + return verbose && xfer_dirs && !am_server; } static void start_filelist_progress(char *kind) @@ -216,17 +220,13 @@ int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks) #endif } -/* - * This function is used to check if a file should be included/excluded +/* 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. The value of - * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES. - */ -static int check_exclude_file(char *fname, int is_dir, int exclude_level) + * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */ +static int is_excluded(char *fname, int is_dir, int filter_level) { - int rc; - #if 0 /* This currently never happens, so avoid a useless compare. */ - if (exclude_level == NO_EXCLUDES) + if (filter_level == NO_FILTERS) return 0; #endif if (fname) { @@ -240,16 +240,13 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level) return 0; } } - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, is_dir) < 0) + if (server_filter_list.head + && check_filter(&server_filter_list, fname, is_dir) < 0) return 1; - if (exclude_level != ALL_EXCLUDES) + if (filter_level != ALL_FILTERS) return 0; - 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) + if (filter_list.head + && check_filter(&filter_list, fname, is_dir) < 0) return 1; return 0; } @@ -534,6 +531,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, static gid_t gid; static char lastname[MAXPATHLEN], *lastdir; static int lastdir_depth, lastdir_len = -1; + static unsigned int del_heir_name_len = -1; + static int in_del_hier = 0; char thisname[MAXPATHLEN]; unsigned int l1 = 0, l2 = 0; int alloc_len, basename_len, dirname_len, linkname_len, sum_len; @@ -547,7 +546,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, rdev_major = 0; uid = 0, gid = 0; *lastname = '\0'; - lastdir_len = -1; + del_heir_name_len = lastdir_len = -1; + in_del_hier = 0; return; } @@ -645,13 +645,27 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, memset(bp, 0, file_struct_len); bp += file_struct_len; - file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0; + file->flags = 0; file->modtime = modtime; file->length = file_length; file->mode = mode; file->uid = uid; file->gid = gid; + if (S_ISDIR(mode)) { + if (flags & XMIT_DEL_START) { + in_del_hier = 1; + del_heir_name_len = l1 + l2; + file->flags |= FLAG_DEL_START; + } else if (delete_during && in_del_hier) { + if (!relative_paths || (l1 >= del_heir_name_len + && thisname[del_heir_name_len] == '/')) + file->flags |= FLAG_DEL_START; + else + in_del_hier = 0; + } + } + if (dirname_len) { file->dirname = lastdir = bp; lastdir_len = dirname_len - 1; @@ -742,7 +756,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, * important case. Some systems may not have d_type. **/ struct file_struct *make_file(char *fname, struct file_list *flist, - int exclude_level) + int filter_level) { static char *lastdir; static int lastdir_len = -1; @@ -772,8 +786,8 @@ struct file_struct *make_file(char *fname, struct file_list *flist, if (readlink_stat(thisname, &st, linkname) != 0) { int save_errno = errno; /* See if file is excluded before reporting an error. */ - if (exclude_level != NO_EXCLUDES - && check_exclude_file(thisname, 0, exclude_level)) + if (filter_level != NO_FILTERS + && is_excluded(thisname, 0, filter_level)) return NULL; if (save_errno == ENOENT) { #if SUPPORT_LINKS @@ -800,11 +814,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } - /* backup.c calls us with exclude_level set to NO_EXCLUDES. */ - if (exclude_level == NO_EXCLUDES) - goto skip_excludes; + /* backup.c calls us with filter_level set to NO_FILTERS. */ + if (filter_level == NO_FILTERS) + goto skip_filters; - if (S_ISDIR(st.st_mode) && !keep_dirs) { + if (S_ISDIR(st.st_mode) && !xfer_dirs) { rprintf(FINFO, "skipping directory %s\n", thisname); return NULL; } @@ -816,7 +830,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, && S_ISDIR(st.st_mode)) flags |= FLAG_MOUNT_POINT; - if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level)) + if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) return NULL; if (lp_ignore_nonreadable(module_id)) { @@ -827,11 +841,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } -skip_excludes: +skip_filters: if (verbose > 2) { rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", - who_am_i(), thisname, exclude_level); + who_am_i(), thisname, filter_level); } if ((basename = strrchr(thisname, '/')) != NULL) { @@ -911,7 +925,7 @@ skip_excludes: memcpy(bp, basename, basename_len); bp += basename_len; -#ifdef HAVE_STRUCT_STAT_ST_RDEV +#if HAVE_STRUCT_STAT_ST_RDEV if (preserve_devices && IS_DEVICE(st.st_mode)) file->u.rdev = st.st_rdev; #endif @@ -967,7 +981,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, /* f is set to -1 when calculating deletion file list */ file = make_file(fname, flist, - f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES); + f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS); if (!file) return; @@ -983,15 +997,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, 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; } } @@ -1004,6 +1010,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) struct dirent *di; char fname[MAXPATHLEN]; unsigned int offset; + void *save_filters; char *p; d = opendir(dir); @@ -1027,18 +1034,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) offset++; } - if (cvs_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 |= IOERR_GENERAL; - rprintf(FINFO, - "cannot cvs-exclude in long-named directory %s\n", - full_fname(fname)); - } - } + save_filters = push_local_filters(fname, offset); for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); @@ -1060,18 +1056,20 @@ static void send_directory(int f, struct file_list *flist, char *dir) rsyserr(FERROR, errno, "readdir(%s)", dir); } + pop_local_filters(save_filters); + 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 - * is set (so that the delete list includes user-excluded files). - **/ +/* This function is normally called by the sender, but the receiving side + * also uses it to construct one or more file lists if one of the --delete + * options have been specified. The delete_in_dir() function 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 is set (so that the delete list includes user-excluded + * files) and it avoids some per-arg init code for limited recursion (since + * delete_in_dir() sets recurse before calling this function). */ struct file_list *send_file_list(int f, int argc, char *argv[]) { int l; @@ -1079,6 +1077,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) char *p, *dir, olddir[sizeof curr_dir]; char lastpath[MAXPATHLEN] = ""; struct file_list *flist; + BOOL need_first_push = True; + struct timeval start_tv, end_tv; int64 start_write; int use_ff_fd = 0; @@ -1086,6 +1086,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) start_filelist_progress("building file list"); start_write = stats.total_written; + gettimeofday(&start_tv, NULL); flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK, "send_file_list"); @@ -1099,6 +1100,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) exit_cleanup(RERR_FILESELECT); } use_ff_fd = 1; + if (curr_dir_len < MAXPATHLEN - 1) { + push_local_filters(curr_dir, curr_dir_len); + need_first_push = False; + } } } @@ -1129,12 +1134,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fname[l] = '\0'; } } - if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) { - if (!recurse && keep_dirs) + if (f == -1) + ; /* recurse is pre-set */ + else if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) { + if (!recurse && xfer_dirs) recurse = 1; /* allow one level */ } else if (recurse > 0) recurse = 0; + if (need_first_push) { + if ((p = strrchr(fname, '/')) != NULL) { + if (*++p && strcmp(p, ".") != 0) + push_local_filters(fname, p - fname); + } else if (strcmp(fname, ".") != 0) + push_local_filters(fname, 0); + need_first_push = False; + } + if (link_stat(fname, &st, keep_dirlinks) != 0) { if (f != -1) { io_error |= IOERR_GENERAL; @@ -1144,7 +1160,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) continue; } - if (S_ISDIR(st.st_mode) && !keep_dirs) { + if (S_ISDIR(st.st_mode) && !xfer_dirs) { rprintf(FINFO, "skipping directory %s\n", fname); continue; } @@ -1177,16 +1193,16 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) *p = '/'; if (fn != p || (*lp && *lp != '/')) { int save_copy_links = copy_links; - int save_keep_dirs = keep_dirs; + int save_xfer_dirs = xfer_dirs; copy_links = copy_unsafe_links; - keep_dirs = 1; + xfer_dirs = 1; while ((slash = strchr(slash+1, '/')) != 0) { *slash = 0; send_file_name(f, flist, fname, 0, 0); *slash = '/'; } copy_links = save_copy_links; - keep_dirs = save_keep_dirs; + xfer_dirs = save_xfer_dirs; *p = 0; strlcpy(lastpath, fname, sizeof lastpath); *p = '/'; @@ -1236,10 +1252,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } if (f != -1) { + gettimeofday(&end_tv, NULL); + stats.flist_buildtime = + (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 + + (end_tv.tv_usec - start_tv.tv_usec) / 1000; + if (stats.flist_buildtime == 0) + stats.flist_buildtime = 1; + start_tv = end_tv; + send_file_entry(NULL, f, 0); if (show_filelist_p()) finish_filelist_progress(flist); + + gettimeofday(&end_tv, NULL); + stats.flist_xfertime = + (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 + + (end_tv.tv_usec - start_tv.tv_usec) / 1000; } if (flist->hlink_pool) { @@ -1644,3 +1673,79 @@ char *f_name(struct file_struct *f) return f_name_to(f, names[n]); } + +static int is_backup_file(char *fn) +{ + int k = strlen(fn) - backup_suffix_len; + return k > 0 && strcmp(fn+k, backup_suffix) == 0; +} + +void delete_in_dir(struct file_list *flist, char *fname) +{ + static int deletion_count = 0; + struct file_list *del_flist; + int save_recurse = recurse; + int save_xfer_dirs = xfer_dirs; + int save_implied_dirs = implied_dirs; + int save_relative_paths = relative_paths; + char *argv[1]; + int i, j, mode; + + if (max_delete && deletion_count >= max_delete) + return; + + if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { + rprintf(FINFO, "IO error encountered - skipping file deletion\n"); + max_delete = -1; /* avoid duplicating the above warning */ + return; + } + + if (delete_during) { + recurse = 1; /* allow one level only */ + xfer_dirs = 1; + implied_dirs = 0; + relative_paths = 1; + } + + argv[0] = fname; + del_flist = send_file_list(-1, 1, argv); + + relative_paths = save_relative_paths; + implied_dirs = save_implied_dirs; + xfer_dirs = save_xfer_dirs; + recurse = save_recurse; + + if (!del_flist) + return; + + if (verbose > 1) + rprintf(FINFO, "deleting in %s\n", safe_fname(fname)); + + for (i = del_flist->count-1; i >= 0; i--) { + if (max_delete && deletion_count >= max_delete) + break; + if (!del_flist->files[i]->basename) + continue; + mode = del_flist->files[i]->mode; + if ((j = flist_find(flist, del_flist->files[i])) < 0 + || (delete_during && S_ISDIR(mode) + && !S_ISDIR(flist->files[j]->mode))) { + char *f = f_name(del_flist->files[i]); + if (make_backups && (backup_dir || !is_backup_file(f)) + && !S_ISDIR(mode)) { + make_backup(f); + if (verbose) { + rprintf(FINFO, "deleting %s\n", + safe_fname(f)); + } + } else { + int dflags = delete_during + ? DEL_DIR | DEL_FORCE_RECURSE + : DEL_DIR | DEL_NO_RECURSE; + delete_file(f, S_ISDIR(mode) ? dflags : 0); + } + deletion_count++; + } + } + flist_free(del_flist); +}