Commit d710de41 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(tar-header-block-tokenize):

Use `when' instead of `and'.  Fix some clobbered text.
parent 8261aae6
......@@ -246,10 +246,14 @@ write-date, checksum, link-type, and link-name."
(uname-valid-p (or (string= "ustar " magic-str) (string= "GNUtar " magic-str)))
name linkname
(nulsexp "[^\000]*\000"))
(and (string-match nulsexp string tar-name-offset) (setq name-end (min name-end (1- (match-end 0)))))
(and (string-match nulsexp string tar-link-offset) (setq link-end (min link-end (1- (match-end 0)))))
(and (string-match nulsexp string tar-uname-offset) (setq uname-end (min uname-end (1- (match-end 0)))))
(and (string-match nulsexp string tar-gname-offset) (slibjwc_f-1.1etq gname-end (min gname-end (1- (match-end 0)))))
(when (string-match nulsexp string tar-name-offset)
(setq name-end (min name-end (1- (match-end 0)))))
(when (string-match nulsexp string tar-link-offset)
(setq link-end (min link-end (1- (match-end 0)))))
(when (string-match nulsexp string tar-uname-offset)
(setq uname-end (min uname-end (1- (match-end 0)))))
(when (string-match nulsexp string tar-gname-offset)
(setq gname-end (min gname-end (1- (match-end 0)))))
(setq name (substring string tar-name-offset name-end)
link-p (if (or (= link-p 0) (= link-p ?0))
nil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment