changeset 103321:f50defb23b3e

(tar-header-block-tokenize): Obey @LongLink even for POSIX tar archives (bug#3410).
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 04 Jun 2009 20:48:16 +0000
parents 8d8a82b45ba7
children 08b8935bfc23
files lisp/ChangeLog lisp/tar-mode.el
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jun 04 20:31:52 2009 +0000
+++ b/lisp/ChangeLog	Thu Jun 04 20:48:16 2009 +0000
@@ -1,3 +1,8 @@
+2009-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* tar-mode.el (tar-header-block-tokenize): Obey @LongLink even for
+	POSIX tar archives (bug#3410).
+
 2009-06-04  Johan Bockgård  <bojohan@gnu.org>
 
 	* vc.el (vc-revision-other-window): Fix argument to backend
--- a/lisp/tar-mode.el	Thu Jun 04 20:31:52 2009 +0000
+++ b/lisp/tar-mode.el	Thu Jun 04 20:48:16 2009 +0000
@@ -276,7 +276,10 @@
             (setq link-p 5))            ; directory
 
         (if (and (equal name "././@LongLink")
-                 (equal magic-str "ustar ")) ;OLDGNU_MAGIC.
+                 ;; Supposedly @LongLink is only used for GNUTAR
+                 ;; format (i.e. "ustar ") but some POSIX Tar files
+                 ;; (with "ustar\0") have been seen using it as well.
+                 (member magic-str '("ustar " "ustar\0")))
             ;; This is a GNU Tar long-file-name header.
             (let* ((size (tar-parse-octal-integer
                           string tar-size-offset tar-time-offset))