comparison lisp/tar-mode.el @ 102525:438d27553e81

(tar-header-block-tokenize): Presume less, check more. (tar-summarize-buffer): Don't silently skip incomplete headers. (tar-mode): Revert to fundamental-mode in case of malformed tar data. (tar-extract): Try to make sure set-auto-mode doesn't mistakenly treat a tar file member as being a tar file itself, just because its own filename includes the parent tar file's.

102524:cec89dff31fa

 
(defun tar-header-block-tokenize (pos coding)
  "Return a `tar-header' structure.
This is a list of name, mode, uid, gid, size,
write-date, checksum, link-type, and link-name."
  (assert (<= (+ pos 512) (point-max)))
  (assert (zerop (mod (- pos (point-min)) 512)))
  (assert (not enable-multibyte-characters))
  (let ((string (buffer-substring pos (setq pos (+ pos 512)))))
    (when      ;(some 'plusp string)		 ; <-- oops, massive cycle hog!
        (or (not (= 0 (aref string 0))) ; This will do.

          (with-current-buffer tar-data-buffer
            (make-progress-reporter "Parsing tar file..."
                                    (point-min) (point-max))))
         descriptor)
    (with-current-buffer tar-data-buffer
      (while (and (<= (+ pos 512) (point-max))
                  (setq descriptor (tar-header-block-tokenize pos coding)))
        (let ((size (tar-header-size descriptor)))
          (if (< size 0)
              (error "%s has size %s - corrupted"
                     (tar-header-name descriptor) size)))

  (set-buffer-multibyte nil)            ;Hopefully a no-op.
  (set (make-local-variable 'tar-data-buffer)
       (generate-new-buffer (format " *tar-data %s*"
                                    (file-name-nondirectory
                                     (or buffer-file-name (buffer-name))))))
  (tar-swap-data)
  (tar-summarize-buffer)
  (tar-next-line 0))


(defun tar-subfile-mode (p)
  "Minor mode for editing an element of a tar-file.
This mode arranges for \"saving\" this buffer to write the data

			     tarname
			     ")"))
	   (read-only-p (or buffer-read-only view-p))
	   (new-buffer-file-name (expand-file-name
				  ;; `:' is not allowed on Windows
				  (concat tarname "!" name)))
	   (buffer (get-file-buffer new-buffer-file-name))
	   (just-created nil)
	   undo-list)
      (unless buffer
	(setq buffer (generate-new-buffer bufname))

102525:438d27553e81

 
(defun tar-header-block-tokenize (pos coding)
  "Return a `tar-header' structure.
This is a list of name, mode, uid, gid, size,
write-date, checksum, link-type, and link-name."
  (if (> (+ pos 512) (point-max)) (error "Malformed Tar header"))
  (assert (zerop (mod (- pos (point-min)) 512)))
  (assert (not enable-multibyte-characters))
  (let ((string (buffer-substring pos (setq pos (+ pos 512)))))
    (when      ;(some 'plusp string)		 ; <-- oops, massive cycle hog!
        (or (not (= 0 (aref string 0))) ; This will do.

          (with-current-buffer tar-data-buffer
            (make-progress-reporter "Parsing tar file..."
                                    (point-min) (point-max))))
         descriptor)
    (with-current-buffer tar-data-buffer
      (while (and (< pos (point-max))
                  (setq descriptor (tar-header-block-tokenize pos coding)))
        (let ((size (tar-header-size descriptor)))
          (if (< size 0)
              (error "%s has size %s - corrupted"
                     (tar-header-name descriptor) size)))

  (set-buffer-multibyte nil)            ;Hopefully a no-op.
  (set (make-local-variable 'tar-data-buffer)
       (generate-new-buffer (format " *tar-data %s*"
                                    (file-name-nondirectory
                                     (or buffer-file-name (buffer-name))))))
  (condition-case err
      (progn
        (tar-swap-data)
        (tar-summarize-buffer)
        (tar-next-line 0))
    (error
     ;; If summarizing caused an error, then maybe the buffer doesn't contain
     ;; tar data.  Rather than show a mysterious empty buffer, let's
     ;; revert to fundamental-mode.
     (fundamental-mode)
     (signal (car err) (cdr err)))))


(defun tar-subfile-mode (p)
  "Minor mode for editing an element of a tar-file.
This mode arranges for \"saving\" this buffer to write the data

			     tarname
			     ")"))
	   (read-only-p (or buffer-read-only view-p))
	   (new-buffer-file-name (expand-file-name
				  ;; `:' is not allowed on Windows
                                  (concat tarname "!"
                                          (if (string-match "/" name)
                                              name
                                            ;; Make sure `name' contains a /
                                            ;; so set-auto-mode doesn't try
                                            ;; to look at `tarname' for hints.
                                            (concat "./" name)))))
	   (buffer (get-file-buffer new-buffer-file-name))
	   (just-created nil)
	   undo-list)
      (unless buffer
	(setq buffer (generate-new-buffer bufname))