(tar-header-block-tokenize):
Use `when' instead of `and'. Fix some clobbered text.
This commit is contained in:
parent
8261aae6ec
commit
d710de4114
1 changed files with 8 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue