X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4f5b0756df0dfc925b9576db47ecce949c378e18..d4021b6d9b9a644a539746c98fe24f61d95e8ea5:/flist.c diff --git a/flist.c b/flist.c index 731ffee9..207a84dd 100644 --- a/flist.c +++ b/flist.c @@ -30,24 +30,18 @@ extern struct stats stats; extern int verbose; -extern int do_progress; extern int am_root; extern int am_server; extern int am_daemon; extern int am_sender; +extern int do_progress; extern int always_checksum; extern int module_id; extern int ignore_errors; extern int numeric_ids; - extern int recurse; 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; extern int keep_dirlinks; extern int preserve_links; @@ -58,15 +52,18 @@ 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 deletion_count; extern int max_delete; extern int orig_umask; extern int list_only; +extern unsigned int curr_dir_len; +extern char *log_format; + +extern char curr_dir[MAXPATHLEN]; extern struct filter_list_struct filter_list; extern struct filter_list_struct server_filter_list; @@ -75,9 +72,8 @@ int io_error; static char empty_sum[MD4_SUM_LENGTH]; static unsigned int file_struct_len; -static struct file_list *received_flist; +static struct file_list *received_flist, *sorting_flist; static dev_t filesystem_dev; /* used to implement -x */ -static int deletion_count = 0; /* used to implement --max-delete */ static void clean_flist(struct file_list *flist, int strip_root, int no_dups); static void output_flist(struct file_list *flist, const char *whose_list); @@ -330,7 +326,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) char fname[MAXPATHLEN]; int l1, l2; - if (f == -1) + if (f < 0) return; if (!file) { @@ -975,7 +971,8 @@ void send_file_name(int f, struct file_list *flist, char *fname, struct file_struct *file; char fbuf[MAXPATHLEN]; - if (!(file = make_file(fname, flist, ALL_FILTERS))) + file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS); + if (!file) return; maybe_emit_filelist_progress(flist); @@ -1010,7 +1007,9 @@ void send_file_name(int f, struct file_list *flist, char *fname, * or a number >= 0 indicating how many levels of recursion we will allow. * This function is normally called by the sender, but the receiving side * also calls it from delete_in_dir() with f set to -1 so that we just - * construct the file list in memory without sending it over the wire. */ + * construct the file list in memory without sending it over the wire. Also, + * get_dirlist() calls this with f set to -2, which indicates that local + * filter rules should be ignored. */ static void send_directory(int f, struct file_list *flist, char *fbuf, unsigned int len) { @@ -1315,7 +1314,7 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); - if (f != -1) { + if (f >= 0) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ recv_uid_list(f, flist); @@ -1449,8 +1448,10 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) if (!flist || flist->count == 0) return; + sorting_flist = flist; qsort(flist->files, flist->count, sizeof flist->files[0], (int (*)())file_compare); + sorting_flist = NULL; for (i = no_dups? 0 : flist->count; i < flist->count; i++) { if (flist->files[i]->basename) { @@ -1671,6 +1672,18 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) if (!*c2) { switch (state2) { case s_DIR: + if (state1 == s_SLASH && sorting_flist) { + int j; + /* Optimize for future comparisons. */ + for (j = 0; + j < sorting_flist->count; + j++) { + struct file_struct *fp + = sorting_flist->files[j]; + if (fp->dirname == f2->dirname) + fp->dirname = f1->dirname; + } + } state2 = s_SLASH; c2 = (uchar*)"/"; break; @@ -1733,10 +1746,23 @@ char *f_name(struct file_struct *f) } -static int is_backup_file(char *fn) +struct file_list *get_dirlist(const char *dirname, int ignore_filter_rules) { - int k = strlen(fn) - backup_suffix_len; - return k > 0 && strcmp(fn+k, backup_suffix) == 0; + struct file_list *dirlist; + char dirbuf[MAXPATHLEN]; + int dlen; + int save_recurse = recurse; + + dlen = strlcpy(dirbuf, dirname, MAXPATHLEN); + if (dlen >= MAXPATHLEN) + return NULL; + + dirlist = flist_new(WITHOUT_HLINK, "get_dirlist"); + recurse = 0; + send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen); + recurse = save_recurse; + + return dirlist; } @@ -1809,7 +1835,8 @@ void delete_in_dir(struct file_list *flist, char *fbuf, void delete_missing(struct file_list *full_list, struct file_list *dir_list, const char *dirname) { - int i, mode; + char fbuf[MAXPATHLEN]; + int i; if (max_delete && deletion_count >= max_delete) return; @@ -1820,22 +1847,11 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list, for (i = dir_list->count; i--; ) { if (!dir_list->files[i]->basename) continue; - mode = dir_list->files[i]->mode; if (flist_find(full_list, dir_list->files[i]) < 0) { - char *f = f_name(dir_list->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 if (S_ISDIR(mode)) - delete_file(f, DEL_DIR | DEL_FORCE_RECURSE); - else - delete_file(f, 0); - deletion_count++; - if (max_delete && deletion_count >= max_delete) + char *fn = f_name_to(dir_list->files[i], fbuf); + int mode = dir_list->files[i]->mode; + int dflag = S_ISDIR(mode) ? DEL_FORCE_RECURSE : 0; + if (delete_file(fn, mode, dflag) < 0) break; } }