Browse Source

ChangeLog

Sergey Poznyakoff 16 years ago
parent
commit
c1b55e02b1
3 changed files with 5 additions and 9 deletions
  1. 0 3
      src/common.h
  2. 2 6
      src/names.c
  3. 3 0
      src/tar.c

+ 0 - 3
src/common.h

@@ -93,9 +93,6 @@ GLOBAL enum subcommand subcommand_option;
 /* Selected format for output archive.  */
 /* Selected format for output archive.  */
 GLOBAL enum archive_format archive_format;
 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
 /* 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
    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
    not have _option in their name, even if their values is derived from

+ 2 - 6
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.
    static storage and can't be relied upon across two calls.
 
 
    If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as
    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
    Entries of type NELT_FMASK cause updates of the matching_flags
    value. */
    value. */
 struct name_elt *
 struct name_elt *
@@ -301,9 +300,6 @@ name_next_elt (int change_dirs)
   const char *source;
   const char *source;
   char *cursor;
   char *cursor;
 
 
-  if (filename_terminator == '\0')
-    change_dirs = 0;
-
   while (name_index != names)
   while (name_index != names)
     {
     {
       struct name_elt *ep;
       struct name_elt *ep;

+ 3 - 0
src/tar.c

@@ -1042,6 +1042,9 @@ report_textual_dates (struct tar_args *args)
 
 
 static volatile int _argp_hang;
 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 */
 enum read_file_list_state  /* Result of reading file name from the list file */
   {
   {
     file_list_success,     /* OK, name read successfully */
     file_list_success,     /* OK, name read successfully */