(tar-untar-buffer): If the entry has directory link type, extract it

as a directory even if its file name doesn't end with a slash.  Fixes
extraction of NetBSD tar archives.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ac6b7a541f4ba81176eb61070ae6e24aff67135..5ad79ce1421cd11d0bee95e098e08044bbdbf4db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-23  Magnus Henoch  <mange@freemail.hu>
+
+       * tar-mode.el (tar-untar-buffer): If the entry has directory
+       link type, extract it as a directory even if its file name doesn't
+       end with a slash.  Fixes extraction of NetBSD tar archives.
+
 2008-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * server.el (server-start): Also don't get confused by CRs since we

diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 2d9651832b50bed22389eb771e0562728e253411..4589127e26b084a2ce84d2f9c87cd2b67c34835d 100644 (file)
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -395,7 +395,9 @@ MODE should be an integer which is a file mode value."
          (dolist (descriptor tar-parse-info)
            (let* ((tokens (tar-desc-tokens descriptor))
                   (name (tar-header-name tokens))
-                  (dir (file-name-directory name))
+                  (dir (if (eq (tar-header-link-type tokens) 5)
+                           name
+                         (file-name-directory name)))
                   (start (+ (tar-desc-data-start descriptor)
                             (- tar-header-offset (point-min))))
                   (end (+ start (tar-header-size tokens))))