Fix passing string values via TAR_OPTIONS

* src/tar.c (parse_default_options): Don't free parsed words.
* tests/options03.at: New testcase.
* tests/Makefile.am: Add options03.at
* tests/testsuite.at: Include options03.at

diff --git a/src/tar.c b/src/tar.c
index ba24c4345859ac88a576c5f3856257069572b30d..35bac38c279334912aef336143044a966da9d83a 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -2201,8 +2201,9 @@ parse_default_options (void)
     {
       ws.ws_wordv[0] = (char*) program_name;
       more_options (ws.ws_offs + ws.ws_wordc, ws.ws_wordv, &loc);
+      /* Don't free consumed words */
+      ws.ws_wordc = 0;
     }
-
   wordsplit_free (&ws);
 }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ea6d1725db8a7335f40f19bc4c1b99be94c25cb..3e638e37e9b942c4a8aad58ff68c23db78225a9e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -171,6 +171,7 @@ TESTSUITE_AT = \
  positional03.at\
  options.at\
  options02.at\
+ options03.at\
  owner.at\
  pipe.at\
  recurse.at\

diff --git a/tests/options03.at b/tests/options03.at
new file mode 100644 (file)
index 0000000..de8b16d
--- /dev/null
+++ b/tests/options03.at
@@ -0,0 +1,44 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+#
+# Test suite for GNU tar.
+# Copyright 2016 Free Software Foundation, Inc.
+#
+# This file is part of GNU tar.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([TAR_OPTIONS with string arguments])
+AT_KEYWORDS([options options03])
+
+# Check whether string values are passed correctly through the
+# TAR_OPTIONS environment variable.  In tar 1.29 the stored values
+# were inadvertenlty freedm which caused TAR_OPTION to malfunction.
+# Reported by: Jan Larres <jan@majutsushi.net>
+# References: <20160906072153.c75tga556ti5sgk2@majutsushi.net>,
+#             http://lists.gnu.org/archive/html/bug-tar/2016-09/msg00005.html
+
+AT_CHECK([
+echo dir/bar > exclude.list
+mkdir dir
+genfile --file=dir/foo
+genfile --file=dir/bar
+TAR_OPTIONS=--exclude-from=exclude.list tar cf arc.tar dir
+tar tf arc.tar
+],
+[0],
+[dir/
+dir/foo
+])
+
+AT_CLEANUP

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 11c39c9f690efcf46379ea05bc8337106a85b5c7..6fe5f89c88c8d5ed85f3added2bd110459c558f6 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -204,6 +204,7 @@ m4_include([pipe.at])
 
 m4_include([options.at])
 m4_include([options02.at])
+m4_include([options03.at])
 
 AT_BANNER([Option compatibility])
 m4_include([opcomp01.at])