From: Wayne Davison Date: Wed, 14 Apr 2004 21:59:45 +0000 (+0000) Subject: Added a description arg to check_exclude(). X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/5387514eaf499a0f6388c44aec9002cedbbec210 Added a description arg to check_exclude(). --- diff --git a/flist.c b/flist.c index 012e6f0f..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; } diff --git a/util.c b/util.c index d197a5f7..fd630099 100644 --- a/util.c +++ b/util.c @@ -476,7 +476,8 @@ static int exclude_server_path(char *arg) if (server_exclude_list) { for (s = arg; (s = strchr(s, '/')) != NULL; ) { *s = '\0'; - if (check_exclude(server_exclude_list, arg, 1)) { + if (check_exclude(server_exclude_list, arg, 1, + "server pattern")) { /* We must leave arg truncated! */ return 1; }