ChangeLog

diff --git a/src/common.h b/src/common.h
index f43673b328978f26bc8ea893ef7c4b94552f3fdc..91ae10cf8cf775effe79c71a38bcf488ef2705aa 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -93,9 +93,6 @@ GLOBAL enum subcommand subcommand_option;
 /* Selected format for output archive.  */
 GLOBAL enum archive_format archive_format;
 
-/* Either NL or NUL, as decided by the --null option.  */
-GLOBAL char filename_terminator;
-
 /* Size of each record, once in blocks, once in bytes.  Those two variables
    are always related, the second being BLOCKSIZE times the first.  They do
    not have _option in their name, even if their values is derived from

diff --git a/src/names.c b/src/names.c
index 73b8741858e70335c0d99c211919143cf78b1cff..0c3aebfc6cd4513cb8034bdcad37a588b728ba08 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -289,9 +289,8 @@ static int matching_flags; /* exclude_fnmatch options */
    static storage and can't be relied upon across two calls.
 
    If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as
-   the request to change to the given directory.  If filename_terminator
-   is NUL, CHANGE_DIRS is effectively always false.
-
+   the request to change to the given directory.
+   
    Entries of type NELT_FMASK cause updates of the matching_flags
    value. */
 struct name_elt *
@@ -301,9 +300,6 @@ name_next_elt (int change_dirs)
   const char *source;
   char *cursor;
 
-  if (filename_terminator == '\0')
-    change_dirs = 0;
-
   while (name_index != names)
     {
       struct name_elt *ep;

diff --git a/src/tar.c b/src/tar.c
index 4680f4677f33f1aac85eff797bceba0cbd95aa68..67bb0be7816eed29dabfea111e8f33aa2f79c24f 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1042,6 +1042,9 @@ report_textual_dates (struct tar_args *args)
 \f
 static volatile int _argp_hang;
 
+/* Either NL or NUL, as decided by the --null option.  */
+static char filename_terminator;
+
 enum read_file_list_state  /* Result of reading file name from the list file */
   {
     file_list_success,     /* OK, name read successfully */