;;; tar-mode.el --- simple editing of tar files from GNU emacs
-;;; Author: Jamie Zawinski <jwz@lucid.com>
-;;; Created: 4 Apr 1990
-;;; Version: 1.21, 10 Mar 91
+;;; Copyright (C) 1990, 1991, 1993, 1994 Free Software Foundation, Inc.
+
+;; Author: Jamie Zawinski <jwz@lucid.com>
+;; Created: 04 Apr 1990
+;; Version: 1.21bis (some cleanup by ESR)
+;; Keywords: unix
-;;; Copyright (C) 1990, 1991 Free Software Foundation, Inc.
-;;;
;;; This file is part of GNU Emacs.
;;;
;;; GNU Emacs is free software; you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
;;; any later version.
;;;
;;; GNU Emacs is distributed in the hope that it will be useful,
;;; along with GNU Emacs; see the file COPYING. If not, write to
;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Commentary:
+
;;; This package attempts to make dealing with Unix 'tar' archives easier.
;;; When this code is loaded, visiting a file whose name ends in '.tar' will
;;; cause the contents of that archive file to be displayed in a Dired-like
;;; and re-insert the modified files into the archive. See the documentation
;;; string of tar-mode for more info.
-;;; To autoload, add this to your .emacs file:
-;;;
-;;; (setq auto-mode-alist (cons '("\\.tar$" . tar-mode) auto-mode-alist))
-;;; (autoload 'tar-mode "tar-mode")
-;;;
-;;; But beware: for certain tar files - those whose very first file has
-;;; a -*- property line - autoloading won't work. See the function
-;;; "tar-normal-mode" to understand why.
-
;;; This code now understands the extra fields that GNU tar adds to tar files.
;;; This interacts correctly with "uncompress.el" in the Emacs library,
;;; o Block files, sparse files, continuation files, and the various header
;;; types aren't editable. Actually I don't know that they work at all.
+;;; Rationale:
+
+;;; Why does tar-mode edit the file itself instead of using tar?
+
+;;; That means that you can edit tar files which you don't have room for
+;;; on your local disk.
+
+;;; I don't know about recent features in gnu tar, but old versions of tar
+;;; can't replace a file in the middle of a tar file with a new version.
+;;; Tar-mode can. I don't think tar can do things like chmod the subfiles.
+;;; An implementation which involved unpacking and repacking the file into
+;;; some scratch directory would be very wasteful, and wouldn't be able to
+;;; preserve the file owners.
+
+;;; Code:
+
(defvar tar-anal-blocksize 20
"*The blocksize of tar files written by Emacs, or nil, meaning don't care.
The blocksize of a tar file is not really the size of the blocks; rather, it is
editing a file in the tar archive at all is bad - the changed version of
the file never exists on disk.")
+(defvar tar-parse-info nil)
+(defvar tar-header-offset nil)
+(defvar tar-superior-buffer nil)
+(defvar tar-superior-descriptor nil)
+(defvar tar-subfile-mode nil)
+(put 'tar-parse-info 'permanent-local t)
+(put 'tar-header-offset 'permanent-local t)
+(put 'tar-superior-buffer 'permanent-local t)
+(put 'tar-superior-descriptor 'permanent-local t)
\f
;;; First, duplicate some Common Lisp functions; I used to just (require 'cl)
;;; but "cl.el" was messing some people up (also it's really big).
(defconst tar-dmin-offset (+ tar-dmaj-offset 8))
(defconst tar-end-offset (+ tar-dmin-offset 8))
-(defun tokenize-tar-header-block (string)
- "Returns a 'tar-header' structure (a list of name, mode, uid, gid, size,
-write-date, checksum, link-type, and link-name)."
+(defun tar-header-block-tokenize (string)
+ "Return a `tar-header' structure.
+This is a list of name, mode, uid, gid, size,
+write-date, checksum, link-type, and link-name."
(cond ((< (length string) 512) nil)
(;(some 'plusp string) ; <-- oops, massive cycle hog!
(or (not (= 0 (aref string 0))) ; This will do.
(defun tar-parse-octal-integer (string &optional start end)
- "deletes all your files, and then reboots."
(if (null start) (setq start 0))
(if (null end) (setq end (length string)))
(if (= (aref string start) 0)
(tar-dotimes (i L)
(if (or (< (aref string i) ?0)
(> (aref string i) ?7))
- (error "'%c' is not an octal digit."))))
+ (error "'%c' is not an octal digit"))))
(tar-parse-octal-integer string))
-(defun checksum-tar-header-block (string)
- "Computes and returns a tar-acceptable checksum for this block."
+(defun tar-header-block-checksum (string)
+ "Compute and return a tar-acceptable checksum for this block."
(let* ((chk-field-start tar-chk-offset)
(chk-field-end (+ chk-field-start 8))
(sum 0)
i (1+ i)))
(+ sum (* 32 8))))
-(defun check-tar-header-block-checksum (hblock desired-checksum file-name)
+(defun tar-header-block-check-checksum (hblock desired-checksum file-name)
"Beep and print a warning if the checksum doesn't match."
- (if (not (= desired-checksum (checksum-tar-header-block hblock)))
+ (if (not (= desired-checksum (tar-header-block-checksum hblock)))
(progn (beep) (message "Invalid checksum for file %s!" file-name))))
-(defun recompute-tar-header-block-checksum (hblock)
+(defun tar-header-block-recompute-checksum (hblock)
"Modifies the given string to have a valid checksum field."
- (let* ((chk (checksum-tar-header-block hblock))
+ (let* ((chk (tar-header-block-checksum hblock))
(chk-string (format "%6o" chk))
(l (length chk-string)))
(aset hblock 154 0)
(if (zerop (logand 2048 mode)) nil (aset string (+ start 5) ?s))
string)
-(defun summarize-tar-header-block (tar-hblock &optional mod-p)
- "Returns a line similar to the output of 'tar -vtf'."
+(defun tar-header-block-summarize (tar-hblock &optional mod-p)
+ "Returns a line similar to the output of `tar -vtf'."
(let ((name (tar-header-name tar-hblock))
(mode (tar-header-mode tar-hblock))
(uid (tar-header-uid tar-hblock))
(progn
(tar-dotimes (i 3) (aset string (+ namestart 1 (length name) i) (aref (if (= link-p 1) "==>" "-->") i)))
(tar-dotimes (i (length link-name)) (aset string (+ namestart 5 (length name) i) (aref link-name i)))))
+ (put-text-property namestart (length string)
+ 'mouse-face 'highlight string)
string)))
(defun tar-summarize-buffer ()
- "Parse the contents of the tar file in the current buffer, and place a
-dired-like listing on the front; then narrow to it, so that only that listing
+ "Parse the contents of the tar file in the current buffer.
+Place a dired-like listing on the front;
+then narrow to it, so that only that listing
is visible (and the real data of the buffer is hidden)."
(message "parsing tar file...")
(let* ((result '())
(tokens nil))
(while (not (eq tokens 'empty-tar-block))
(let* ((hblock (buffer-substring pos (+ pos 512))))
- (setq tokens (tokenize-tar-header-block hblock))
+ (setq tokens (tar-header-block-tokenize hblock))
(setq pos (+ pos 512))
(message "parsing tar file...%s%%"
;(/ (* pos 100) bs) ; this gets round-off lossage
)
(if (eq tokens 'empty-tar-block)
nil
- (if (null tokens) (error "premature EOF parsing tar file."))
+ (if (null tokens) (error "premature EOF parsing tar file"))
(if (eq (tar-header-link-type tokens) 20)
;; Foo. There's an extra empty block after these.
(setq pos (+ pos 512)))
(let ((size (tar-header-size tokens)))
(if (< size 0)
- (error "%s has size %s - corrupted."
+ (error "%s has size %s - corrupted"
(tar-header-name tokens) size))
;
; This is just too slow. Don't really need it anyway....
- ;(check-tar-header-block-checksum
- ; hblock (checksum-tar-header-block hblock)
+ ;(tar-header-block-check-checksum
+ ; hblock (tar-header-block-checksum hblock)
; (tar-header-name tokens))
(setq result (cons (make-tar-desc pos tokens) result))
(let ((buffer-read-only nil))
(tar-dolist (tar-desc tar-parse-info)
(insert-string
- (summarize-tar-header-block (tar-desc-tokens tar-desc)))
+ (tar-header-block-summarize (tar-desc-tokens tar-desc)))
(insert-string "\n"))
(make-local-variable 'tar-header-offset)
(setq tar-header-offset (point))
(narrow-to-region 1 tar-header-offset)
(set-buffer-modified-p nil)))
(message "parsing tar file...done."))
-
-
-(defvar tar-mode-map nil "*Local keymap for tar-mode listings.")
+\f
+(defvar tar-mode-map nil "*Local keymap for Tar mode listings.")
(if tar-mode-map
nil
(define-key tar-mode-map "\^D" 'tar-flag-deleted)
(define-key tar-mode-map "e" 'tar-extract)
(define-key tar-mode-map "f" 'tar-extract)
+ (define-key tar-mode-map [mouse-2] 'tar-mouse-extract)
(define-key tar-mode-map "g" 'revert-buffer)
(define-key tar-mode-map "h" 'describe-mode)
(define-key tar-mode-map "n" 'tar-next-line)
(define-key tar-mode-map "\^N" 'tar-next-line)
(define-key tar-mode-map "o" 'tar-extract-other-window)
- (define-key tar-mode-map "\^C" 'tar-copy)
(define-key tar-mode-map "p" 'tar-previous-line)
(define-key tar-mode-map "\^P" 'tar-previous-line)
(define-key tar-mode-map "r" 'tar-rename-entry)
(define-key tar-mode-map "G" 'tar-chgrp-entry)
(define-key tar-mode-map "O" 'tar-chown-entry)
)
-
+\f
+;; Make menu bar items.
+
+;; Get rid of the Edit menu bar item to save space.
+(define-key tar-mode-map [menu-bar edit] 'undefined)
+
+(define-key tar-mode-map [menu-bar immediate]
+ (cons "Immediate" (make-sparse-keymap "Immediate")))
+
+(define-key tar-mode-map [menu-bar immediate view]
+ '("View This File" . tar-view))
+(define-key tar-mode-map [menu-bar immediate display]
+ '("Display in Other Window" . tar-display-file))
+(define-key tar-mode-map [menu-bar immediate find-file-other-window]
+ '("Find in Other Window" . tar-extract-other-window))
+(define-key tar-mode-map [menu-bar immediate find-file]
+ '("Find This File" . tar-extract))
+
+(define-key tar-mode-map [menu-bar mark]
+ (cons "Mark" (make-sparse-keymap "Mark")))
+
+(define-key tar-mode-map [menu-bar mark unmark-all]
+ '("Unmark All" . tar-clear-modification-flags))
+(define-key tar-mode-map [menu-bar mark deletion]
+ '("Flag" . tar-flag-deleted))
+(define-key tar-mode-map [menu-bar mark unmark]
+ '("Unflag" . tar-unflag))
+
+(define-key tar-mode-map [menu-bar operate]
+ (cons "Operate" (make-sparse-keymap "Operate")))
+
+(define-key tar-mode-map [menu-bar operate chown]
+ '("Change Owner..." . tar-chown-entry))
+(define-key tar-mode-map [menu-bar operate chgrp]
+ '("Change Group..." . tar-chgrp-entry))
+(define-key tar-mode-map [menu-bar operate chmod]
+ '("Change Mode..." . tar-chmod-entry))
+(define-key tar-mode-map [menu-bar operate rename]
+ '("Rename to..." . tar-rename-entry))
+(define-key tar-mode-map [menu-bar operate copy]
+ '("Copy to..." . tar-copy))
+(define-key tar-mode-map [menu-bar operate expunge]
+ '("Expunge marked files" . tar-expunge))
+\f
;; tar mode is suitable only for specially formatted data.
(put 'tar-mode 'mode-class 'special)
(put 'tar-subfile-mode 'mode-class 'special)
+;;;###autoload
(defun tar-mode ()
"Major mode for viewing a tar file as a dired-like listing of its contents.
You can move around using the usual cursor motion commands.
Letters no longer insert themselves.
-Type 'e' to pull a file out of the tar file and into its own buffer.
-Type 'c' to copy an entry from the tar file into another file on disk.
+Type `e' to pull a file out of the tar file and into its own buffer;
+or click mouse-2 on the file's line in the Tar mode buffer.
+Type `c' to copy an entry from the tar file into another file on disk.
-If you edit a sub-file of this archive (as with the 'e' command) and
-save it with Control-X Control-S, the contents of that buffer will be
+If you edit a sub-file of this archive (as with the `e' command) and
+save it with Control-x Control-s, the contents of that buffer will be
saved back into the tar-file buffer; in this way you can edit a file
inside of a tar archive without extracting it and re-archiving it.
-See also: variables tar-update-datestamp and tar-anal-blocksize.
+See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
\\{tar-mode-map}"
;; this is not interactive because you shouldn't be turning this
;; mode on and off. You can corrupt things that way.
+ ;; rms: with permanent locals, it should now be possible to make this work
+ ;; interactively in some reasonable fashion.
+ (kill-all-local-variables)
(make-local-variable 'tar-header-offset)
(make-local-variable 'tar-parse-info)
(make-local-variable 'require-final-newline)
(setq require-final-newline nil) ; binary data, dude...
(make-local-variable 'revert-buffer-function)
(setq revert-buffer-function 'tar-mode-revert)
+ (make-local-variable 'enable-local-variables)
+ (setq enable-local-variables nil)
(setq major-mode 'tar-mode)
(setq mode-name "Tar")
(use-local-map tar-mode-map)
)
+;; This should be converted to use a minor mode keymap.
+
(defun tar-subfile-mode (p)
"Minor mode for editing an element of a tar-file.
-This mode redefines ^X^S to save the current buffer back into its
+This mode redefines C-x C-s to save the current buffer back into its
associated tar-file buffer. You must save that buffer to actually
save your changes to disk."
(interactive "P")
- (or (and (boundp 'superior-tar-buffer) superior-tar-buffer)
- (error "This buffer is not an element of a tar file."))
- (or (assq 'tar-subfile-mode minor-mode-alist)
- (setq minor-mode-alist (append minor-mode-alist
- (list '(tar-subfile-mode
- " TarFile")))))
+ (or (and (boundp 'tar-superior-buffer) tar-superior-buffer)
+ (error "This buffer is not an element of a tar file"))
+;;; Don't do this, because it is redundant and wastes mode line space.
+;;; (or (assq 'tar-subfile-mode minor-mode-alist)
+;;; (setq minor-mode-alist (append minor-mode-alist
+;;; (list '(tar-subfile-mode " TarFile")))))
(make-local-variable 'tar-subfile-mode)
(setq tar-subfile-mode
(if (null p)
(not tar-subfile-mode)
(> (prefix-numeric-value p) 0)))
(cond (tar-subfile-mode
- ;; copy the local keymap so that we don't accidentally
- ;; alter a keymap like 'lisp-mode-map' which is shared
- ;; by all buffers in that mode.
- (let ((m (current-local-map)))
- (if m (use-local-map (copy-keymap m))))
- (local-set-key "\^X\^S" 'tar-subfile-save-buffer)
+ (make-local-variable 'local-write-file-hooks)
+ (setq local-write-file-hooks '(tar-subfile-save-buffer))
;; turn off auto-save.
(auto-save-mode nil)
(setq buffer-auto-save-file-name nil)
(run-hooks 'tar-subfile-mode-hook))
- (t (local-set-key "\^X\^S" 'save-buffer)))
- )
+ (t
+ (kill-local-variable 'local-write-file-hooks))))
+;; Revert the buffer and recompute the dired-like listing.
(defun tar-mode-revert (&optional no-autosave no-confirm)
- "Revert this buffer and turn on tar mode again, to re-compute the
-directory listing."
(setq tar-header-offset nil)
(let ((revert-buffer-function nil))
(revert-buffer t no-confirm)
(tar-next-line (- p)))
(defun tar-current-descriptor (&optional noerror)
- "Returns the tar-descriptor of the current line, or signals an error."
+ "Return the tar-descriptor of the current line, or signals an error."
;; I wish lines had plists, like in ZMACS...
(or (nth (count-lines (point-min)
(save-excursion (beginning-of-line) (point)))
tar-parse-info)
(if noerror
nil
- (error "This line does not describe a tar-file entry."))))
-
+ (error "This line does not describe a tar-file entry"))))
-(defun tar-extract (&optional other-window-p)
- "*In tar-mode, extract this entry of the tar file into its own buffer."
- (interactive)
- (let* ((view-p (eq other-window-p 'view))
- (descriptor (tar-current-descriptor))
+(defun tar-get-descriptor ()
+ (let* ((descriptor (tar-current-descriptor))
(tokens (tar-desc-tokens descriptor))
- (name (tar-header-name tokens))
(size (tar-header-size tokens))
- (link-p (tar-header-link-type tokens))
- (start (+ (tar-desc-data-start descriptor) tar-header-offset -1))
- (end (+ start size)))
+ (link-p (tar-header-link-type tokens)))
(if link-p
- (error "This is a %s, not a real file."
+ (error "This is a %s, not a real file"
(cond ((eq link-p 5) "directory")
((eq link-p 20) "tar directory header")
((eq link-p 29) "multivolume-continuation")
((eq link-p 35) "sparse entry")
((eq link-p 38) "volume header")
(t "link"))))
- (if (zerop size) (error "This is a zero-length file."))
+ (if (zerop size) (error "This is a zero-length file"))
+ descriptor))
+
+(defun tar-mouse-extract (event)
+ "Extract a file whose tar directory line you click on."
+ (interactive "e")
+ (save-excursion
+ (set-buffer (window-buffer (posn-window (event-end event))))
+ (save-excursion
+ (goto-char (posn-point (event-end event)))
+ ;; Just make sure this doesn't get an error.
+ (tar-get-descriptor)))
+ (select-window (posn-window (event-end event)))
+ (goto-char (posn-point (event-end event)))
+ (tar-extract))
+
+(defun tar-extract (&optional other-window-p)
+ "In Tar mode, extract this entry of the tar file into its own buffer."
+ (interactive)
+ (let* ((view-p (eq other-window-p 'view))
+ (descriptor (tar-get-descriptor))
+ (tokens (tar-desc-tokens descriptor))
+ (name (tar-header-name tokens))
+ (size (tar-header-size tokens))
+ (start (+ (tar-desc-data-start descriptor) tar-header-offset -1))
+ (end (+ start size)))
(let* ((tar-buffer (current-buffer))
+ (tarname (file-name-nondirectory (buffer-file-name)))
(bufname (concat (file-name-nondirectory name)
- " (" name " in "
- (file-name-nondirectory (buffer-file-name))
+ " ("
+ tarname
")"))
(read-only-p (or buffer-read-only view-p))
(buffer (get-buffer bufname))
(set-buffer buffer)
(insert-buffer-substring tar-buffer start end)
(goto-char 0)
- (set-visited-file-name name) ; give it a name to decide mode.
+ ;; Give it a name for list-buffers and to decide mode.
+ ;; Set buffer-file-name by hand first
+ ;; so that set-visited-file-name won't lock the filename.
+ (setq buffer-file-name
+ (expand-file-name (concat tarname ":" name)))
+ (set-visited-file-name buffer-file-name)
(normal-mode) ; pick a mode.
- (set-visited-file-name nil) ; nuke the name - not meaningful.
+;;; Without a file name, save-buffer doesn't work.
+;;; (set-visited-file-name nil) ; nuke the name - not meaningful.
(rename-buffer bufname)
- (make-local-variable 'superior-tar-buffer)
- (make-local-variable 'superior-tar-descriptor)
- (setq superior-tar-buffer tar-buffer)
- (setq superior-tar-descriptor descriptor)
+ (make-local-variable 'tar-superior-buffer)
+ (make-local-variable 'tar-superior-descriptor)
+ (setq tar-superior-buffer tar-buffer)
+ (setq tar-superior-descriptor descriptor)
+
(tar-subfile-mode 1)
(setq buffer-read-only read-only-p)
(if view-p
(progn
(view-buffer buffer)
- (and just-created (kill-buffer buffer)))
+ (and just-created
+ (setq view-exit-action 'kill-buffer)))
+ (if (eq other-window-p 'display)
+ (display-buffer buffer)
(if other-window-p
(switch-to-buffer-other-window buffer)
- (switch-to-buffer buffer))))))
+ (switch-to-buffer buffer)))))))
(defun tar-extract-other-window ()
- "*In tar-mode, extract this entry of the tar file into its own buffer."
+ "*In Tar mode, find this entry of the tar file in another window."
(interactive)
(tar-extract t))
+(defun tar-display-other-window ()
+ "*In Tar mode, display this entry of the tar file in another window."
+ (interactive)
+ (tar-extract 'display))
+
(defun tar-view ()
- "*In tar-mode, view the tar file entry on this line."
+ "*In Tar mode, view the tar file entry on this line."
(interactive)
(tar-extract 'view))
(defun tar-read-file-name (&optional prompt)
- "Calls read-file-name, with the default being the file of the current
-tar-file descriptor."
+ "Read a file name with this line's entry as the default."
(or prompt (setq prompt "Copy to: "))
(let* ((default-file (expand-file-name
(tar-header-name (tar-desc-tokens
(defun tar-copy (&optional to-file)
- "*In tar-mode, extract this entry of the tar file into a file on disk.
+ "*In Tar mode, extract this entry of the tar file into a file on disk.
If TO-FILE is not supplied, it is prompted for, defaulting to the name of
the current tar-entry."
(interactive (list (tar-read-file-name)))
- (let* ((descriptor (tar-current-descriptor))
+ (let* ((descriptor (tar-get-descriptor))
(tokens (tar-desc-tokens descriptor))
(name (tar-header-name tokens))
(size (tar-header-size tokens))
- (link-p (tar-header-link-type tokens))
(start (+ (tar-desc-data-start descriptor) tar-header-offset -1))
(end (+ start size)))
- (if link-p (error "This is a link, not a real file."))
- (if (zerop size) (error "This is a zero-length file."))
- (let* ((tar-buffer (current-buffer))
- buffer)
- (unwind-protect
- (progn
- (setq buffer (generate-new-buffer "*tar-copy-tmp*"))
- (widen)
- (save-excursion
- (set-buffer buffer)
- (insert-buffer-substring tar-buffer start end)
- (set-buffer-modified-p nil) ; in case we abort
- (write-file to-file)
- (message "Copied tar entry %s to %s" name to-file)
- (set-buffer tar-buffer)))
- (narrow-to-region 1 tar-header-offset)
- (if buffer (kill-buffer buffer)))
- )))
-
+ (save-restriction
+ (widen)
+ (write-region start end to-file))
+ (message "Copied tar entry %s to %s" name to-file)))
(defun tar-flag-deleted (p &optional unflag)
- "*In tar mode, mark this sub-file to be deleted from the tar file.
+ "*In Tar mode, mark this sub-file to be deleted from the tar file.
With a prefix argument, mark that many files."
(interactive "p")
(beginning-of-line)
(if (eobp) nil (forward-char 36)))
(defun tar-unflag (p)
- "*In tar mode, un-mark this sub-file if it is marked to be deleted.
+ "*In Tar mode, un-mark this sub-file if it is marked to be deleted.
With a prefix argument, un-mark that many files forward."
(interactive "p")
(tar-flag-deleted p t))
(defun tar-unflag-backwards (p)
- "*In tar mode, un-mark this sub-file if it is marked to be deleted.
+ "*In Tar mode, un-mark this sub-file if it is marked to be deleted.
With a prefix argument, un-mark that many files backward."
(interactive "p")
(tar-flag-deleted (- p) t))
(defun tar-expunge (&optional noconfirm)
- "*In tar-mode, delete all the archived files flagged for deletion.
+ "*In Tar mode, delete all the archived files flagged for deletion.
This does not modify the disk image; you must save the tar file itself
for this to be permanent."
(interactive)
(defun tar-clear-modification-flags ()
- "remove the stars at the beginning of each line."
+ "Remove the stars at the beginning of each line."
(save-excursion
(goto-char 0)
(while (< (point) tar-header-offset)
(interactive
(list (read-string "New name: "
(tar-header-name (tar-desc-tokens (tar-current-descriptor))))))
- (if (string= "" new-name) (error "zero length name."))
- (if (> (length new-name) 98) (error "name too long."))
+ (if (string= "" new-name) (error "zero length name"))
+ (if (> (length new-name) 98) (error "name too long"))
(tar-setf (tar-header-name (tar-desc-tokens (tar-current-descriptor)))
new-name)
(tar-alter-one-field 0
(let ((p (point)))
(forward-line 1)
(delete-region p (point))
- (insert (summarize-tar-header-block tokens) "\n")
+ (insert (tar-header-block-summarize tokens) "\n")
(setq tar-header-offset (point-max)))
(widen)
(insert new-data-string) ; <--
;;
;; compute a new checksum and insert it.
- (let ((chk (checksum-tar-header-block
+ (let ((chk (tar-header-block-checksum
(buffer-substring start (+ start 512)))))
(goto-char (+ start tar-chk-offset))
(delete-region (point) (+ (point) 8))
(tar-setf (tar-header-checksum tokens) chk)
;;
;; ok, make sure we didn't botch it.
- (check-tar-header-block-checksum
+ (tar-header-block-check-checksum
(buffer-substring start (+ start 512))
chk (tar-header-name tokens))
)))
(narrow-to-region 1 tar-header-offset))))
+(defun tar-octal-time (timeval)
+ ;; Format a timestamp as 11 octal digits. Ghod, I hope this works...
+ (let ((hibits (car timeval)) (lobits (car (cdr timeval))))
+ (insert (format "%05o%01o%05o"
+ (lsh hibits -2)
+ (logior (lsh (logand 3 hibits) 1) (> (logand lobits 32768) 0))
+ (logand 32767 lobits)
+ ))))
+
(defun tar-subfile-save-buffer ()
- "In tar subfile mode, write this buffer back into its parent tar-file buffer.
-This doesn't write anything to disk - you must save the parent tar-file buffer
+ "In tar subfile mode, save this buffer into its parent tar-file buffer.
+This doesn't write anything to disk; you must save the parent tar-file buffer
to make your changes permanent."
(interactive)
- (if (not (and (boundp 'superior-tar-buffer) superior-tar-buffer))
- (error "this buffer has no superior tar file buffer."))
- (if (not (and (boundp 'superior-tar-descriptor) superior-tar-descriptor))
- (error "this buffer doesn't have an index into its superior tar file!"))
+ (if (not (and (boundp 'tar-superior-buffer) tar-superior-buffer))
+ (error "This buffer has no superior tar file buffer"))
+ (if (not (and (boundp 'tar-superior-descriptor) tar-superior-descriptor))
+ (error "This buffer doesn't have an index into its superior tar file!"))
(save-excursion
(let ((subfile (current-buffer))
(subfile-size (buffer-size))
- (descriptor superior-tar-descriptor))
- (set-buffer superior-tar-buffer)
+ (descriptor tar-superior-descriptor))
+ (set-buffer tar-superior-buffer)
(let* ((tokens (tar-desc-tokens descriptor))
(start (tar-desc-data-start descriptor))
(name (tar-header-name tokens))
nil
(goto-char (+ header-start tar-time-offset))
(delete-region (point) (+ (point) 12))
- (insert (format "%11o" (current-time)))
+ (insert (tar-octal-time (current-time)))
(insert ? ))
;;
;; compute a new checksum and insert it.
- (let ((chk (checksum-tar-header-block
+ (let ((chk (tar-header-block-checksum
(buffer-substring header-start data-start))))
(goto-char (+ header-start tar-chk-offset))
(delete-region (point) (+ (point) 8))
(next-line position)
(beginning-of-line)
(let ((p (point))
+ after
(m (set-marker (make-marker) tar-header-offset)))
(forward-line 1)
- (delete-region p (point))
- (insert-before-markers (summarize-tar-header-block tokens t) "\n")
+ (setq after (point))
+ ;; Insert the new text after the old, before deleting,
+ ;; to preserve the window start.
+ (insert-before-markers (tar-header-block-summarize tokens t) "\n")
+ (delete-region p after)
(setq tar-header-offset (marker-position m)))
)))
;; after doing the insertion, add any final padding that may be necessary.
(set-buffer-modified-p t) ; mark the tar file as modified
(set-buffer subfile)
(set-buffer-modified-p nil) ; mark the tar subfile as unmodified
- (message "saved into tar-buffer \"%s\" - remember to save that buffer!"
- (buffer-name superior-tar-buffer))
- )))
+ (message "saved into tar-buffer `%s' -- remember to save that buffer!"
+ (buffer-name tar-superior-buffer))
+ ;; Prevent ordinary saving from happening.
+ t)))
(defun tar-pad-to-blocksize ()
(data-end (+ start size))
(bbytes (ash tar-anal-blocksize 9))
(pad-to (+ bbytes (* bbytes (/ (1- data-end) bbytes))))
- (buffer-read-only nil) ; ##
+ (inhibit-read-only t) ; ##
)
;; If the padding after the last data is too long, delete some;
;; else insert some until we are padded out to the right number of blocks.
)))
-(defun maybe-write-tar-file ()
- "Used as a write-file-hook to write tar-files out correctly."
+;; Used in write-file-hook to write tar-files out correctly.
+(defun tar-mode-maybe-write-tar-file ()
;;
- ;; If the current buffer is in tar-mode and has its header-offset set,
+ ;; If the current buffer is in Tar mode and has its header-offset set,
;; only write out the part of the file after the header-offset.
;;
(if (and (eq major-mode 'tar-mode)
\f
;;; Patch it in.
-(defvar tar-regexp "\\.tar$"
- "The regular expression used to identify tar file names.")
-
-(setq auto-mode-alist
- (cons (cons tar-regexp 'tar-mode) auto-mode-alist))
-
-(or (boundp 'write-file-hooks) (setq write-file-hooks nil))
-(or (listp write-file-hooks)
- (setq write-file-hooks (list write-file-hooks)))
-(or (memq 'maybe-write-tar-file write-file-hooks)
+(or (memq 'tar-mode-maybe-write-tar-file write-file-hooks)
(setq write-file-hooks
- (cons 'maybe-write-tar-file write-file-hooks)))
-
-\f
-;;; This is a hack. For files ending in .tar, we want -*- lines to be
-;;; completely ignored - if there is one, it applies to the first file
-;;; in the archive, and not the archive itself!
-
-(defun tar-normal-mode (&optional find-file)
- "Choose the major mode for this buffer automatically.
-Also sets up any specified local variables of the file.
-Uses the visited file name, the -*- line, and the local variables spec.
-
-This function is called automatically from `find-file'. In that case,
-if `inhibit-local-variables' is non-`nil' we require confirmation before
-processing a local variables spec. If you run `normal-mode' explicitly,
-confirmation is never required.
-
-Note that this version of this function has been hacked to interact
-correctly with tar files - when visiting a file which matches
-'tar-regexp', the -*- line and local-variables are not examined,
-as they would apply to a file within the archive rather than the archive
-itself."
- (interactive)
- (if (and buffer-file-name
- (string-match tar-regexp buffer-file-name))
- (tar-mode)
- (tar-real-normal-mode find-file)))
-
-
-(if (not (fboundp 'tar-real-normal-mode))
- (fset 'tar-real-normal-mode (symbol-function 'normal-mode)))
-(fset 'normal-mode 'tar-normal-mode)
+ (cons 'tar-mode-maybe-write-tar-file write-file-hooks)))
(provide 'tar-mode)
HCoop / bpt / emacs.git / blobdiff