[Emacs-diffs] emacs/lisp tar-mode.el ChangeLog

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/06/04 20:48:19

Modified files:
        lisp           : tar-mode.el ChangeLog 

Log message:
        (tar-header-block-tokenize): Obey @LongLink even for
        POSIX tar archives (bug#3410).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/tar-mode.el?cvsroot=emacs&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15666&r2=1.15667

Patches:
Index: tar-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tar-mode.el,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- tar-mode.el 14 Mar 2009 03:03:27 -0000      1.139
+++ tar-mode.el 4 Jun 2009 20:48:16 -0000       1.140
@@ -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))

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15666
retrieving revision 1.15667
diff -u -b -r1.15666 -r1.15667
--- ChangeLog   4 Jun 2009 20:31:52 -0000       1.15666
+++ ChangeLog   4 Jun 2009 20:48:16 -0000       1.15667
@@ -1,3 +1,8 @@
+2009-06-04  Stefan Monnier  <address@hidden>
+
+       * tar-mode.el (tar-header-block-tokenize): Obey @LongLink even for
+       POSIX tar archives (bug#3410).
+
 2009-06-04  Johan Bockgård  <address@hidden>
 
        * vc.el (vc-revision-other-window): Fix argument to backend