From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 Oct 2000 05:30:02 +0000 (+0000)
Subject: (namelist_match, excluded_name): Do not match subfiles of a directory
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=fb93b996c8401d68e4c159ff0b80a5415d9b4f13;p=chaz%2Ftar

(namelist_match, excluded_name): Do not match subfiles of a directory
if --no-recursion is specified.
---

diff --git a/src/names.c b/src/names.c
index 5bc075b..ebcd3e7 100644
--- a/src/names.c
+++ b/src/names.c
@@ -502,7 +502,7 @@ namelist_match (char const *path, size_t length)
 	continue;
 
       if (p->regexp
-	  ? fnmatch (p->name, path, FNM_LEADING_DIR) == 0
+	  ? fnmatch (p->name, path, recursion_option) == 0
 	  : (p->length <= length
 	     && (path[p->length] == '\0' || path[p->length] == '/')
 	     && memcmp (path, p->name, p->length) == 0))
@@ -871,7 +871,7 @@ excluded_name (char const *name)
   name += FILESYSTEM_PREFIX_LEN (name);
 
   if (excluded_filename (excluded_with_slash, name,
-			 FNM_FILE_NAME | FNM_LEADING_DIR))
+			 FNM_FILE_NAME | recursion_option))
     return 1;
 
   for (p = name; *p; p++)