Added a description arg to check_exclude().
authorWayne Davison <wayned@samba.org>
Wed, 14 Apr 2004 21:59:45 +0000 (21:59 +0000)
committerWayne Davison <wayned@samba.org>
Wed, 14 Apr 2004 21:59:45 +0000 (21:59 +0000)
flist.c
util.c

diff --git a/flist.c b/flist.c
index 012e6f0..4d67c3c 100644 (file)
--- 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 d197a5f..fd63009 100644 (file)
--- 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;
                        }