diff options
| -rw-r--r-- | lisp/tar-mode.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index d76950ba083..eb8a42584f1 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -246,10 +246,14 @@ write-date, checksum, link-type, and link-name." | |||
| 246 | (uname-valid-p (or (string= "ustar " magic-str) (string= "GNUtar " magic-str))) | 246 | (uname-valid-p (or (string= "ustar " magic-str) (string= "GNUtar " magic-str))) |
| 247 | name linkname | 247 | name linkname |
| 248 | (nulsexp "[^\000]*\000")) | 248 | (nulsexp "[^\000]*\000")) |
| 249 | (and (string-match nulsexp string tar-name-offset) (setq name-end (min name-end (1- (match-end 0))))) | 249 | (when (string-match nulsexp string tar-name-offset) |
| 250 | (and (string-match nulsexp string tar-link-offset) (setq link-end (min link-end (1- (match-end 0))))) | 250 | (setq name-end (min name-end (1- (match-end 0))))) |
| 251 | (and (string-match nulsexp string tar-uname-offset) (setq uname-end (min uname-end (1- (match-end 0))))) | 251 | (when (string-match nulsexp string tar-link-offset) |
| 252 | (and (string-match nulsexp string tar-gname-offset) (slibjwc_f-1.1etq gname-end (min gname-end (1- (match-end 0))))) | 252 | (setq link-end (min link-end (1- (match-end 0))))) |
| 253 | (when (string-match nulsexp string tar-uname-offset) | ||
| 254 | (setq uname-end (min uname-end (1- (match-end 0))))) | ||
| 255 | (when (string-match nulsexp string tar-gname-offset) | ||
| 256 | (setq gname-end (min gname-end (1- (match-end 0))))) | ||
| 253 | (setq name (substring string tar-name-offset name-end) | 257 | (setq name (substring string tar-name-offset name-end) |
| 254 | link-p (if (or (= link-p 0) (= link-p ?0)) | 258 | link-p (if (or (= link-p 0) (= link-p ?0)) |
| 255 | nil | 259 | nil |