X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9c5e91f8484a4815d589d3fa81777c59559bc2dd..5387514eaf499a0f6388c44aec9002cedbbec210:/flist.c diff --git a/flist.c b/flist.c index f547d761..4d67c3c2 100644 --- a/flist.c +++ b/flist.c @@ -227,14 +227,17 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level) } } if (server_exclude_list - && check_exclude(server_exclude_list, fname, is_dir)) + && check_exclude(server_exclude_list, fname, is_dir, + "server pattern")) return 1; if (exclude_level != ALL_EXCLUDES) return 0; - if (exclude_list && check_exclude(exclude_list, fname, is_dir)) + if (exclude_list && check_exclude(exclude_list, fname, is_dir, + "pattern")) return 1; if (local_exclude_list - && check_exclude(local_exclude_list, fname, is_dir)) + && check_exclude(local_exclude_list, fname, is_dir, + "local-cvsignore")) return 1; return 0; } @@ -997,7 +1000,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset) < MAXPATHLEN - offset) { add_exclude_file(&local_exclude_list, fname, - MISSING_OK, ADD_EXCLUDE); + XFLG_WORD_SPLIT | XFLG_NO_PREFIXES); } else { io_error |= IOERR_GENERAL; rprintf(FINFO,