[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/tar-mode.el,v
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/tar-mode.el,v |
|
Date: |
Fri, 01 Feb 2008 16:02:39 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/02/01 16:01:31
Index: lisp/tar-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tar-mode.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- lisp/tar-mode.el 27 Jan 2008 22:21:11 -0000 1.117
+++ lisp/tar-mode.el 1 Feb 2008 16:01:05 -0000 1.118
@@ -129,16 +129,17 @@
:group 'tar)
(defvar tar-parse-info nil)
-;; Be sure that this variable holds byte position, not char position.
(defvar tar-header-offset nil)
(defvar tar-superior-buffer nil)
(defvar tar-superior-descriptor nil)
(defvar tar-subfile-mode nil)
+(defvar tar-file-name-coding-system 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)
+(put 'tar-file-name-coding-system 'permanent-local t)
(defmacro tar-setf (form val)
"A mind-numbingly simple implementation of setf."
@@ -203,6 +204,7 @@
"Return a `tar-header' structure.
This is a list of name, mode, uid, gid, size,
write-date, checksum, link-type, and link-name."
+ (setq string (string-as-unibyte string))
(cond ((< (length string) 512) nil)
(;(some 'plusp string) ; <-- oops, massive cycle hog!
(or (not (= 0 (aref string 0))) ; This will do.
@@ -231,15 +233,10 @@
(setq linkname (substring string tar-link-offset link-end))
(if default-enable-multibyte-characters
(setq name
- (decode-coding-string name
- (or file-name-coding-system
- default-file-name-coding-system
- 'undecided))
+ (decode-coding-string name tar-file-name-coding-system)
linkname
(decode-coding-string linkname
- (or file-name-coding-system
- default-file-name-coding-system
- 'undecided))))
+ tar-file-name-coding-system)))
(if (and (null link-p) (string-match "/\\'" name)) (setq link-p 5))
; directory
(make-tar-header
name
@@ -298,6 +295,7 @@
(defun tar-header-block-checksum (string)
"Compute and return a tar-acceptable checksum for this block."
+ (setq string (string-as-unibyte string))
(let* ((chk-field-start tar-chk-offset)
(chk-field-end (+ chk-field-start 8))
(sum 0)
@@ -400,7 +398,8 @@
(unless (file-directory-p name)
(write-region start end name))
(set-file-modes name (tar-header-mode tokens))))))
- (set-buffer-multibyte multibyte))))
+ (if multibyte
+ (set-buffer-multibyte 'to)))))
(defun tar-summarize-buffer ()
"Parse the contents of the tar file in the current buffer.
@@ -429,11 +428,11 @@
(if (< size 0)
(error "%s has size %s - corrupted"
(tar-header-name tokens) size))
- ;
- ; This is just too slow. Don't really
need it anyway....
- ;(tar-header-block-check-checksum
- ; hblock (tar-header-block-checksum
hblock)
- ; (tar-header-name tokens))
+ ;;
+ ;; This is just too slow. Don't really need it anyway....
+ ;;(tar-header-block-check-checksum
+ ;; hblock (tar-header-block-checksum hblock)
+ ;; (tar-header-name tokens))
(push (make-tar-desc pos tokens) result)
@@ -441,7 +440,7 @@
(> size 0)
(setq pos
(+ pos 512 (ash (ash (1- size) -9) 9)) ; this works
- ;(+ pos (+ size (- 512 (rem (1- size)
512)))) ; this doesn't
+ ;;(+ pos (+ size (- 512 (rem (1- size) 512)))) ; this
doesn't
))))
(make-local-variable 'tar-parse-info)
(setq tar-parse-info (nreverse result))
@@ -450,12 +449,14 @@
(if (eq tokens 'empty-tar-block)
(progress-reporter-done progress-reporter)
(message "Warning: premature EOF parsing tar file")))
- (set-buffer-multibyte default-enable-multibyte-characters)
+ ;; Obey the user's preference for the use of uni/multibytes.
+ (if default-enable-multibyte-characters
+ (set-buffer-multibyte 'to))
(goto-char (point-min))
- (let ((inhibit-read-only t))
+ (let ((inhibit-read-only t)
;; Collect summary lines and insert them all at once since tar files
;; can be pretty big.
- (let ((total-summaries
+ (total-summaries
(mapconcat
(lambda (tar-desc)
(tar-header-block-summarize (tar-desc-tokens tar-desc)))
@@ -465,7 +466,7 @@
(narrow-to-region (point-min) (point))
(set (make-local-variable 'tar-header-offset) (position-bytes (point)))
(goto-char (point-min))
- (restore-buffer-modified-p modified))))
+ (restore-buffer-modified-p modified)))
(defvar tar-mode-map
(let ((map (make-keymap)))
@@ -575,6 +576,10 @@
(set (make-local-variable 'revert-buffer-function) 'tar-mode-revert)
(set (make-local-variable 'local-enable-local-variables) nil)
(set (make-local-variable 'next-line-add-newlines) nil)
+ (set (make-local-variable 'tar-file-name-coding-system)
+ (or file-name-coding-system
+ default-file-name-coding-system
+ locale-coding-system))
;; Prevent loss of data when saving the file.
(set (make-local-variable 'file-precious-flag) t)
(auto-save-mode 0)
@@ -582,7 +587,7 @@
(buffer-disable-undo)
(widen)
(if (and (boundp 'tar-header-offset) tar-header-offset)
- (narrow-to-region (point-min) (byte-to-position tar-header-offset))
+ (narrow-to-region (point-min) tar-header-offset)
(tar-summarize-buffer)
(tar-next-line 0)))
@@ -701,7 +706,6 @@
(- tar-header-offset (point-min))))
(end (+ start size)))
(let* ((tar-buffer (current-buffer))
- (tar-buffer-multibyte enable-multibyte-characters)
(tarname (buffer-name))
(bufname (concat (file-name-nondirectory name)
" ("
@@ -712,37 +716,25 @@
;; `:' is not allowed on Windows
(concat tarname "!" name)))
(buffer (get-file-buffer new-buffer-file-name))
- (just-created nil))
+ (just-created nil)
+ (pos (point))
+ undo-list)
(unless buffer
(setq buffer (generate-new-buffer bufname))
+ (save-excursion
+ (set-buffer buffer)
+ (setq undo-list buffer-undo-list
+ buffer-undo-list t))
(setq bufname (buffer-name buffer))
(setq just-created t)
(unwind-protect
- (progn
- (widen)
- (set-buffer-multibyte nil)
- (save-excursion
- (set-buffer buffer)
- (let ((buffer-undo-list t))
- (if enable-multibyte-characters
- (progn
- ;; We must avoid unibyte->multibyte conversion.
- (set-buffer-multibyte nil)
- (insert-buffer-substring tar-buffer start end)
- (set-buffer-multibyte t))
- (insert-buffer-substring tar-buffer start end))
- (goto-char (point-min))
- (setq buffer-file-name new-buffer-file-name)
- (setq buffer-file-truename
- (abbreviate-file-name buffer-file-name))
- ;; We need to mimic the parts of insert-file-contents
- ;; which determine the coding-system and decode the text.
- (let ((coding
- (or coding-system-for-read
+ (let (coding)
+ (narrow-to-region start end)
+ (goto-char start)
+ (setq coding (or coding-system-for-read
(and set-auto-coding-function
- (save-excursion
(funcall set-auto-coding-function
- name (- (point-max) (point)))))
+ name (- end start)))
;; The following binding causes
;; find-buffer-file-type-coding-system
;; (defined on dos-w32.el) to act as if
@@ -754,29 +746,25 @@
(car (find-operation-coding-system
'insert-file-contents
(cons name (current-buffer)) t)))))
- (multibyte enable-multibyte-characters)
- (detected (detect-coding-region
- (point-min)
- (min (+ (point-min) 16384) (point-max)) t)))
- (if coding
- (or (numberp (coding-system-eol-type coding))
- (vectorp (coding-system-eol-type detected))
- (setq coding (coding-system-change-eol-conversion
- coding
- (coding-system-eol-type detected))))
- (setq coding
- (find-new-buffer-file-coding-system detected)))
- (if (or (eq coding 'no-conversion)
- (eq (coding-system-type coding) 5))
- (setq multibyte (set-buffer-multibyte nil)))
- (or multibyte
- (setq coding
- (coding-system-change-text-conversion
- coding 'raw-text)))
- (decode-coding-region (point-min) (point-max) coding)
+ (if (or (not coding)
+ (eq (coding-system-type coding) 'undecided))
+ (setq coding (detect-coding-region start end t)))
+ (if (and default-enable-multibyte-characters
+ (coding-system-get coding :for-unibyte))
+ (save-excursion
+ (set-buffer buffer)
+ (set-buffer-multibyte nil)))
+ (widen)
+ (decode-coding-region start end coding buffer)
+ (save-excursion
+ (set-buffer buffer)
+ (goto-char (point-min))
+ (setq buffer-file-name new-buffer-file-name)
+ (setq buffer-file-truename
+ (abbreviate-file-name buffer-file-name))
;; Force buffer-file-coding-system to what
;; decode-coding-region actually used.
- (set-buffer-file-coding-system last-coding-system-used t))
+ (set-buffer-file-coding-system last-coding-system-used t)
;; Set the default-directory to the dir of the
;; superior buffer.
(setq default-directory
@@ -790,11 +778,12 @@
(setq tar-superior-buffer tar-buffer)
(setq tar-superior-descriptor descriptor)
(setq buffer-read-only read-only-p)
- (set-buffer-modified-p nil))
+ (set-buffer-modified-p nil)
+ (setq buffer-undo-list undo-list)
(tar-subfile-mode 1))
(set-buffer tar-buffer))
(narrow-to-region (point-min) tar-header-offset)
- (set-buffer-multibyte tar-buffer-multibyte)))
+ (goto-char pos)))
(if view-p
(view-buffer
buffer (and just-created 'kill-buffer-if-not-modified))
@@ -853,7 +842,6 @@
(start (+ (tar-desc-data-start descriptor)
(- tar-header-offset (point-min))))
(end (+ start size))
- (multibyte enable-multibyte-characters)
(inhibit-file-name-handlers inhibit-file-name-handlers)
(inhibit-file-name-operation inhibit-file-name-operation))
(save-restriction
@@ -867,11 +855,8 @@
(and (eq inhibit-file-name-operation 'write-region)
inhibit-file-name-handlers))
inhibit-file-name-operation 'write-region))
- (unwind-protect
(let ((coding-system-for-write 'no-conversion))
- (set-buffer-multibyte nil)
- (write-region start end to-file nil nil nil t))
- (set-buffer-multibyte multibyte)))
+ (write-region start end to-file nil nil nil t)))
(message "Copied tar entry %s to %s" name to-file)))
(defun tar-flag-deleted (p &optional unflag)
@@ -900,7 +885,6 @@
(tar-flag-deleted (- p) t))
-;; When this function is called, it is sure that the buffer is unibyte.
(defun tar-expunge-internal ()
"Expunge the tar-entry specified by the current line."
(let* ((descriptor (tar-current-descriptor))
@@ -950,11 +934,8 @@
(interactive)
(if (or noconfirm
(y-or-n-p "Expunge files marked for deletion? "))
- (let ((n 0)
- (multibyte enable-multibyte-characters))
+ (let ((n 0))
(save-excursion
- (widen)
- (set-buffer-multibyte nil)
(goto-char (point-min))
(while (not (eobp))
(if (looking-at "D")
@@ -963,8 +944,6 @@
(forward-line 1)))
;; after doing the deletions, add any padding that may be necessary.
(tar-pad-to-blocksize)
- (widen)
- (set-buffer-multibyte multibyte)
(narrow-to-region (point-min) tar-header-offset))
(if (zerop n)
(message "Nothing to expunge.")
@@ -976,7 +955,7 @@
(interactive)
(save-excursion
(goto-char (point-min))
- (while (< (position-bytes (point)) tar-header-offset)
+ (while (< (point) tar-header-offset)
(if (not (eq (following-char) ?\s))
(progn (delete-char 1) (insert " ")))
(forward-line 1))))
@@ -1046,15 +1025,13 @@
(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"))
+ (let ((encoded-new-name (encode-coding-string new-name
+ tar-file-name-coding-system)))
+ (if (> (length encoded-new-name) 98) (error "name too long"))
(tar-setf (tar-header-name (tar-desc-tokens (tar-current-descriptor)))
new-name)
- (if (multibyte-string-p new-name)
- (setq new-name (encode-coding-string new-name
- (or file-name-coding-system
-
default-file-name-coding-system))))
(tar-alter-one-field 0
- (substring (concat new-name (make-string 99 0)) 0 99)))
+ (substring (concat encoded-new-name (make-string 99 0)) 0 99))))
(defun tar-chmod-entry (new-mode)
@@ -1071,8 +1048,7 @@
(defun tar-alter-one-field (data-position new-data-string)
(let* ((descriptor (tar-current-descriptor))
- (tokens (tar-desc-tokens descriptor))
- (multibyte enable-multibyte-characters))
+ (tokens (tar-desc-tokens descriptor)))
(unwind-protect
(save-excursion
;;
@@ -1082,10 +1058,9 @@
(forward-line 1)
(delete-region p (point))
(insert (tar-header-block-summarize tokens) "\n")
- (setq tar-header-offset (position-bytes (point-max))))
+ (setq tar-header-offset (point-max)))
(widen)
- (set-buffer-multibyte nil)
(let* ((start (+ (tar-desc-data-start descriptor)
(- tar-header-offset (point-min))
-512)))
@@ -1093,7 +1068,13 @@
;; delete the old field and insert a new one.
(goto-char (+ start data-position))
(delete-region (point) (+ (point) (length new-data-string))) ; <--
- (insert new-data-string) ; <--
+
+ ;; As new-data-string is unibyte, just inserting it will
+ ;; make eight-bit chars to the corresponding multibyte
+ ;; chars. This avoid that conversion, i.e., eight-bit
+ ;; chars are converted to multibyte form of eight-bit
+ ;; chars.
+ (insert (string-to-multibyte new-data-string))
;;
;; compute a new checksum and insert it.
(let ((chk (tar-header-block-checksum
@@ -1111,7 +1092,6 @@
chk (tar-header-name tokens))
)))
(narrow-to-region (point-min) tar-header-offset)
- (set-buffer-multibyte multibyte)
(tar-next-line 0))))
@@ -1136,14 +1116,9 @@
(error "This buffer doesn't have an index into its superior tar file!"))
(save-excursion
(let ((subfile (current-buffer))
- (subfile-multibyte enable-multibyte-characters)
(coding buffer-file-coding-system)
(descriptor tar-superior-descriptor)
subfile-size)
- ;; We must make the current buffer unibyte temporarily to avoid
- ;; multibyte->unibyte conversion in `insert-buffer-substring'.
- (set-buffer-multibyte nil)
- (setq subfile-size (buffer-size))
(set-buffer tar-superior-buffer)
(let* ((tokens (tar-desc-tokens descriptor))
(start (tar-desc-data-start descriptor))
@@ -1151,28 +1126,28 @@
(size (tar-header-size tokens))
(size-pad (ash (ash (+ size 511) -9) 9))
(head (memq descriptor tar-parse-info))
- (following-descs (cdr head))
- (tar-buffer-multibyte enable-multibyte-characters))
+ (following-descs (cdr head)))
(if (not head)
(error "Can't find this tar file entry in its parent tar file!"))
(unwind-protect
(save-excursion
- (widen)
- (set-buffer-multibyte nil)
;; delete the old data...
(let* ((data-start (+ start (- tar-header-offset (point-min))))
(data-end (+ data-start (ash (ash (+ size 511) -9) 9))))
- (delete-region data-start data-end)
+ (narrow-to-region data-start data-end)
+ (delete-region (point-min) (point-max))
;; insert the new data...
(goto-char data-start)
- (insert-buffer-substring subfile)
- (setq subfile-size
- (encode-coding-region
- data-start (+ data-start subfile-size) coding))
+ (save-excursion
+ (set-buffer subfile)
+ (save-restriction
+ (widen)
+ (encode-coding-region 1 (point-max) coding tar-superior-buffer)))
+ (setq subfile-size (- (point-max) (point-min)))
;;
;; pad the new data out to a multiple of 512...
(let ((subfile-size-pad (ash (ash (+ subfile-size 511) -9) 9)))
- (goto-char (+ data-start subfile-size))
+ (goto-char (point-max))
(insert (make-string (- subfile-size-pad subfile-size) 0))
;;
;; update the data pointer of this and all following files...
@@ -1183,6 +1158,7 @@
(+ (tar-desc-data-start desc) difference))))
;;
;; Update the size field in the header block.
+ (widen)
(let ((header-start (- data-start 512)))
(goto-char (+ header-start tar-size-offset))
(delete-region (point) (+ (point) 12))
@@ -1221,19 +1197,16 @@
;; Insert the new text after the old, before deleting,
;; to preserve the window start.
(let ((line (tar-header-block-summarize tokens t)))
- (insert-before-markers (string-as-unibyte line) "\n"))
+ (insert-before-markers line "\n"))
(delete-region p after)
(setq tar-header-offset (marker-position m)))
)))
;; after doing the insertion, add any final padding that may be
necessary.
(tar-pad-to-blocksize))
- (narrow-to-region (point-min) tar-header-offset)
- (set-buffer-multibyte tar-buffer-multibyte)))
+ (narrow-to-region (point-min) tar-header-offset)))
(set-buffer-modified-p t) ; mark the tar file as modified
(tar-next-line 0)
(set-buffer subfile)
- ;; Restore the buffer multibyteness.
- (set-buffer-multibyte subfile-multibyte)
(set-buffer-modified-p nil) ; mark the tar subfile as unmodified
(message "Saved into tar-buffer `%s'. Be sure to save that buffer!"
(buffer-name tar-superior-buffer))
@@ -1281,14 +1254,13 @@
;; tar-header-offset turns out to be null for files fetched with W3,
;; at least.
(let ((coding-system-for-write 'no-conversion))
- (write-region (if tar-header-offset
- (byte-to-position tar-header-offset)
+ (write-region (or tar-header-offset
(point-min))
(point-max)
buffer-file-name nil t))
(tar-clear-modification-flags)
(set-buffer-modified-p nil))
- (narrow-to-region (point-min) (byte-to-position tar-header-offset)))
+ (narrow-to-region (point-min) tar-header-offset))
;; Return t because we've written the file.
t)
- [Emacs-diffs] Changes to emacs/lisp/tar-mode.el,v,
Miles Bader <=