*** tar-mode.el 12 Jan 2009 11:33:35 +1100 1.135 --- tar-mode.el 12 Jan 2009 11:33:59 +1100 *************** *** 240,246 **** (link-p (aref string tar-linkp-offset)) (magic-str (substring string tar-magic-offset (1- tar-uname-offset))) ! (uname-valid-p (car (member magic-str '("ustar " "ustar\0\0")))) name linkname (nulsexp "[^\000]*\000")) (when (string-match nulsexp string tar-name-offset) --- 240,249 ---- (link-p (aref string tar-linkp-offset)) (magic-str (substring string tar-magic-offset (1- tar-uname-offset))) ! (uname-valid-p (car (member magic-str ! '("ustar " ;; "OLDGNU" ! "ustar\0\0" ;; per tar-rename-entry ! "ustar\0\060")))) ;; POSIX name linkname (nulsexp "[^\000]*\000")) (when (string-match nulsexp string tar-name-offset) *************** *** 256,262 **** nil (- link-p ?0))) (setq linkname (substring string tar-link-offset link-end)) ! (when (and (equal uname-valid-p "ustar\0\0") (string-match nulsexp string tar-prefix-offset) (> (match-end 0) (1+ tar-prefix-offset))) (setq name (concat (substring string tar-prefix-offset --- 259,266 ---- nil (- link-p ?0))) (setq linkname (substring string tar-link-offset link-end)) ! (when (and (member uname-valid-p '("ustar\0\0" ;; tar-rename-entry ! "ustar\0\060")) ;; POSIX (string-match nulsexp string tar-prefix-offset) (> (match-end 0) (1+ tar-prefix-offset))) (setq name (concat (substring string tar-prefix-offset