From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 17 Jul 1999 01:49:35 +0000 (+0000)
Subject: (read_and): Exclude pathnames if any of their components are excluded.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=be4c265a8d26361c843c46ace0e88c14062a4213;p=chaz%2Ftar

(read_and): Exclude pathnames if any of their components are excluded.
(from_oct): Use C quoting style for error; omit trailing nuls.
---

diff --git a/src/list.c b/src/list.c
index 9c6d6a0..c58eae4 100644
--- a/src/list.c
+++ b/src/list.c
@@ -70,7 +70,7 @@ read_and (void (*do_something) ())
 
 	  if (!name_match (current_file_name)
 	      || current_stat.st_mtime < newer_mtime_option
-	      || excluded_filename (excluded, base_name (current_file_name)))
+	      || excluded_pathname (excluded, current_file_name))
 	    {
 	      int isextended = 0;
 
@@ -577,12 +577,14 @@ from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval)
 	  if (!o)
 	    {
 	      o = clone_quoting_options ((struct quoting_options *) 0);
-	      set_quoting_style (o, escape_quoting_style);
+	      set_quoting_style (o, c_quoting_style);
 	    }
 
-	  quotearg_buffer (buf, sizeof buf, where0, digs0, o);
+	  for (digs = digs0;  digs && ! where0[digs - 1];  digs--)
+	    continue;
+	  quotearg_buffer (buf, sizeof buf, where0, digs, o);
 	  ERROR ((0, 0,
-		  _("Header contains \"%.*s\" where octal %s value expected"),
+		  _("Header contains %.*s where octal %s value expected"),
 		  (int) sizeof buf, buf, type));
 	}