Fix bug in the inplementation of --one-top-level.

When extracting an archive that contains './' with the --one-top-level option,
the mode and ownership of '.' would be incorrectly applied to the current
working directory, instead of the requested top-level directory.

* src/list.c (enforce_one_top_level): Map '.' to the top-level
directory.
* tests/Makefile.am: Add onetop05.at
* tests/testsuite.at: Include onetop05.at.
* tests/onetop05.at: New file.
* tests/onetop01.at: Fix keywords.
* tests/onetop02.at: Likewise.
* tests/onetop03.at: Likewise.
* tests/onetop04.at: Likewise.

diff --git a/src/list.c b/src/list.c
index 22bec010e475516f8a19e89d10519627c756db69..79f04c0f1648c39f373b584182395ca586d3ee4e 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -124,18 +124,20 @@ enforce_one_top_level (char **pfile_name)
   for (p = file_name; *p && (ISSLASH (*p) || *p == '.'); p++)
     ;
 
-  if (!*p)
-    return;
-
-  if (strncmp (p, one_top_level_dir, strlen (one_top_level_dir)) == 0)
+  if (*p)
     {
       int pos = strlen (one_top_level_dir);
-      if (ISSLASH (p[pos]) || p[pos] == 0)
-       return;
+      if (strncmp (p, one_top_level_dir, pos) == 0)
+       {
+         if (ISSLASH (p[pos]) || p[pos] == 0)
+           return;
+       }
+    
+      *pfile_name = new_name (one_top_level_dir, file_name);
+      normalize_filename_x (*pfile_name);
     }
-
-  *pfile_name = new_name (one_top_level_dir, file_name);
-  normalize_filename_x (*pfile_name);
+  else
+    *pfile_name = xstrdup (one_top_level_dir);
   free (file_name);
 }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f1459291038a76e54bc11f65e4b69ad9be757580..06722c3da1470609d8a9f785ed93315af364afb5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -154,6 +154,7 @@ TESTSUITE_AT = \
  onetop02.at\
  onetop03.at\
  onetop04.at\
+ onetop05.at\
  opcomp01.at\
  opcomp02.at\
  opcomp03.at\

diff --git a/tests/onetop01.at b/tests/onetop01.at
index a970a991ae9e5b1ef1a152ecd2b0ff241d196728..c97edd4b65d6a411ddb00e05807c7691448669f2 100644 (file)
--- a/tests/onetop01.at
+++ b/tests/onetop01.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 #
 # Test suite for GNU tar.
-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014,2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU tar.
 #

diff --git a/tests/onetop02.at b/tests/onetop02.at
index 454f69285aa4e806a8ac6e547f21ce713d91f44e..301f79a14f20c768a97a1871c4488d67b0bea9c1 100644 (file)
--- a/tests/onetop02.at
+++ b/tests/onetop02.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 #
 # Test suite for GNU tar.
-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014,2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU tar.
 #

diff --git a/tests/onetop03.at b/tests/onetop03.at
index 3ffc71da169ef8923abdda815e7d9ffc9da5bc10..7429387b93304ce376f39d66aeebf7c42d8b90ec 100644 (file)
--- a/tests/onetop03.at
+++ b/tests/onetop03.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 #
 # Test suite for GNU tar.
-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014,2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU tar.
 #
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 AT_SETUP([tar --one-top-level --transform])
-AT_KEYWORDS([extract onetop onetop02])
+AT_KEYWORDS([extract onetop onetop03])
 
 AT_TAR_CHECK([
 AT_SORT_PREREQ

diff --git a/tests/onetop04.at b/tests/onetop04.at
index 37fba19ae0b585811baf4826f403231307e932db..564574871dca78cdf2fd3e53a770484f46a936bb 100644 (file)
--- a/tests/onetop04.at
+++ b/tests/onetop04.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 #
 # Test suite for GNU tar.
-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014,2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU tar.
 #
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 AT_SETUP([tar --one-top-level --transform])
-AT_KEYWORDS([extract onetop onetop02])
+AT_KEYWORDS([extract onetop onetop04])
 
 AT_TAR_CHECK([
 AT_SORT_PREREQ

diff --git a/tests/onetop05.at b/tests/onetop05.at
new file mode 100644 (file)
index 0000000..0a67111
--- /dev/null
+++ b/tests/onetop05.at
@@ -0,0 +1,69 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+#
+# Test suite for GNU tar.
+# Copyright 2015 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 --one-top-level restoring permissions])
+AT_KEYWORDS([extract onetop onetop05])
+
+# When extracting an archive that contains ./ with the --one-top-level option,
+# the mode and ownership of ./ would be incorrectly applied to the current
+# working directory, instead of the requested top-level directory.
+
+AT_TAR_CHECK([
+orig_mode=3702
+mkdir d
+chmod $orig_mode d
+genfile --file d/file
+tar -cf d.tar -C d .
+rm -rf d
+
+(mkdir d1
+chmod 700 d1
+cd d1
+tar --one-top-level=top -xpf ../d.tar)
+mode=$(genfile --stat=mode.777 d1)
+if test 700 = $mode; then
+    echo "CWD: OK"
+else
+    echo "CWD: mode changed: 700 != $mode"
+fi
+
+mkdir d2
+chmod 700 d2
+tar -C d2 --one-top-level=top -xpf d.tar
+mode=$(genfile --stat=mode.777 d2)
+if test 700 = $mode; then
+    echo "DIR: OK"
+else
+    echo "DIR: mode changed: 700 != $mode"
+fi
+mode=$(genfile --stat=mode.7777 d2/top)
+if test $mode = $orig_mode; then
+    echo "TOP: OK"
+else    
+    echo "TOP: mode changed: $orig_mode != $mode"
+fi
+],
+[0],
+[CWD: OK
+DIR: OK
+TOP: OK
+])
+
+AT_CLEANUP

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4b1c8054be8c0d7a5ec2355f839b88996281583f..46e42d34956ae706c24ae692ab025c086f043654 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -428,6 +428,7 @@ m4_include([onetop01.at])
 m4_include([onetop02.at])
 m4_include([onetop03.at])
 m4_include([onetop04.at])
+m4_include([onetop05.at])
 
 AT_BANNER([Star tests])
 m4_include([star/gtarfail.at])