X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b9a4b5011e4804cc372fe3cba4b45ebb3ccac489..9f803d0d12548c2e5facc359846598f0a5c01271:/lisp/hexl.el diff --git a/lisp/hexl.el b/lisp/hexl.el index a38e12366e..2043196a63 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -1,8 +1,10 @@ -;;; hexl-mode.el --- edit a file in a hex dump format using the hexl filter. +;;; hexl.el --- edit a file in a hex dump format using the hexl filter. -;; Copyright (C) 1989 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1994 Free Software Foundation, Inc. ;; Author: Keith Gabryelski +;; Maintainer: FSF +;; Keywords: data ;; This file is part of GNU Emacs. @@ -22,6 +24,12 @@ ;;; Commentary: +;; This package implements a major mode for editing binary files. It uses +;; a program called hexl, supplied with the GNU Emacs distribution, that +;; can filter a binary into an editable format or from the format back into +;; binary. For full instructions, invoke `hexl-mode' on an empty buffer and +;; do `M-x describe-mode'. +;; ;; This may be useful in your .emacs: ;; ;; (autoload 'hexl-find-file "hexl" @@ -46,7 +54,7 @@ (defvar hexl-program "hexl" "The program that will hexlify and de-hexlify its stdin. -`hexl-program' will always be concated with `hexl-options' +`hexl-program' will always be concatenated with `hexl-options' and \"-de\" when dehexlfying a buffer.") (defvar hexl-iso "" @@ -56,13 +64,13 @@ and \"-de\" when dehexlfying a buffer.") (defvar hexl-options (format "-hex %s" hexl-iso) "Options to hexl-program that suit your needs.") -(defvar hexlify-command (format "%s %s" hexl-program hexl-options) - "The command to use to hexlify a buffer. It is the concatination of -`hexl-program' and `hexl-options'.") +(defvar hexlify-command + (format "%s%s %s" exec-directory hexl-program hexl-options) + "The command to use to hexlify a buffer.") -(defvar dehexlify-command (format "%s -de %s" hexl-program hexl-options) - "The command to use to unhexlify a buffer. It is the concatination of -`hexl-program', the option \"-de\", and `hexl-options'.") +(defvar dehexlify-command + (format "%s%s -de %s" exec-directory hexl-program hexl-options) + "The command to use to unhexlify a buffer.") (defvar hexl-max-address 0 "Maximum offset into hexl buffer.") @@ -74,7 +82,7 @@ and \"-de\" when dehexlfying a buffer.") ;;;###autoload (defun hexl-mode (&optional arg) "\\ -A major mode for editting binary files in hex dump format. +A major mode for editing binary files in hex dump format. This function automatically converts a buffer into the hexl format using the function `hexlify-buffer'. @@ -160,54 +168,64 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode. (setq major-mode 'hexl-mode) (make-local-variable 'write-contents-hooks) - (setq write-contents-hooks - (cons 'hexl-save-buffer write-contents-hooks)) + (add-hook 'write-contents-hooks 'hexl-save-buffer) + + (make-local-variable 'hexl-max-address) + + (make-local-variable 'change-major-mode-hook) + (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer) (let ((modified (buffer-modified-p)) - (read-only buffer-read-only) + (inhibit-read-only t) (original-point (1- (point)))) (if (not (or (eq arg 1) (not arg))) -;; if no argument then we guess at hexl-max-address + ;; if no argument then we guess at hexl-max-address (setq hexl-max-address (+ (* (/ (1- (buffer-size)) 68) 16) 15)) - (setq buffer-read-only nil) (setq hexl-max-address (1- (buffer-size))) (hexlify-buffer) (set-buffer-modified-p modified) - (setq buffer-read-only read-only) (hexl-goto-address original-point))))) +(defvar hexl-in-save-buffer nil) + (defun hexl-save-buffer () "Save a hexl format buffer as binary in visited file if modified." (interactive) - (set-buffer-modified-p (if (buffer-modified-p) - (save-excursion - (let ((buf (generate-new-buffer " hexl")) - (name (buffer-name)) - (file-name (buffer-file-name)) - (start (point-min)) - (end (point-max)) - modified) - (set-buffer buf) - (insert-buffer-substring name start end) - (set-buffer name) - (dehexlify-buffer) - (save-buffer) - (setq modified (buffer-modified-p)) - (delete-region (point-min) (point-max)) - (insert-buffer-substring buf start end) - (kill-buffer buf) - modified)) - (message "(No changes need to be saved)") - nil)) - ;; Return t to indicate we have saved t - t) + (if hexl-in-save-buffer nil + (set-buffer-modified-p (if (buffer-modified-p) + (save-excursion + (let ((buf (generate-new-buffer " hexl")) + (name (buffer-name)) + (file-name (buffer-file-name)) + (start (point-min)) + (end (point-max)) + modified) + (set-buffer buf) + (insert-buffer-substring name start end) + (set-buffer name) + (dehexlify-buffer) + ;; Prevent infinite recursion. + (let ((hexl-in-save-buffer t) + (buffer-file-type t)) ; for ms-dos + (save-buffer)) + (setq modified (buffer-modified-p)) + (delete-region (point-min) (point-max)) + (insert-buffer-substring buf start end) + (kill-buffer buf) + modified)) + (message "(No changes need to be saved)") + nil)) + ;; Return t to indicate we have saved t + t)) ;;;###autoload (defun hexl-find-file (filename) "Edit file FILENAME in hexl-mode. Switch to a buffer visiting file FILENAME, creating one in none exists." (interactive "fFilename: ") - (find-file filename) + (if (eq system-type 'ms-dos) + (find-file-binary filename) + (find-file filename)) (if (not (eq major-mode 'hexl-mode)) (hexl-mode))) @@ -217,19 +235,28 @@ With arg, don't unhexlify buffer." (interactive "p") (if (or (eq arg 1) (not arg)) (let ((modified (buffer-modified-p)) - (read-only buffer-read-only) + (inhibit-read-only t) (original-point (1+ (hexl-current-address)))) - (setq buffer-read-only nil) (dehexlify-buffer) + (remove-hook 'write-contents-hook 'hexl-save-buffer) (set-buffer-modified-p modified) - (setq buffer-read-only read-only) (goto-char original-point))) (setq mode-name hexl-mode-old-mode-name) (use-local-map hexl-mode-old-local-map) (setq major-mode hexl-mode-old-major-mode) -;; Kludge to update mode-line - (switch-to-buffer (current-buffer)) -) + (force-mode-line-update)) + +(defun hexl-maybe-dehexlify-buffer () + "Convert a hexl format buffer to binary. +Ask the user for confirmation." + (if (y-or-n-p "Convert contents back to binary format? ") + (let ((modified (buffer-modified-p)) + (inhibit-read-only t) + (original-point (1+ (hexl-current-address)))) + (dehexlify-buffer) + (remove-hook 'write-contents-hook 'hexl-save-buffer) + (set-buffer-modified-p modified) + (goto-char original-point)))) (defun hexl-current-address () "Return current hexl-address." @@ -482,21 +509,25 @@ You may also type up to 3 octal digits, to insert a character with that code" ;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF +;;;###autoload (defun hexlify-buffer () - "Convert a binary buffer to hexl format" + "Convert a binary buffer to hexl format." (interactive) - (shell-command-on-region (point-min) (point-max) hexlify-command t)) + (let ((binary-process-output nil) ; for Ms-Dos + (binary-process-input t)) + (shell-command-on-region (point-min) (point-max) hexlify-command t))) (defun dehexlify-buffer () "Convert a hexl format buffer to binary." (interactive) - (shell-command-on-region (point-min) (point-max) dehexlify-command t)) + (let ((binary-process-output t) ; for Ms-Dos + (binary-process-input nil)) + (shell-command-on-region (point-min) (point-max) dehexlify-command t))) (defun hexl-char-after-point () "Return char for ASCII hex digits at point." - (setq lh (char-after (point))) - (setq rh (char-after (1+ (point)))) - (hexl-htoi lh rh)) + (hexl-htoi (char-after (point)) + (char-after (1+ (point))))) (defun hexl-htoi (lh rh) "Hex (char) LH (char) RH to integer." @@ -543,9 +574,9 @@ You may also type up to 3 octal digits, to insert a character with that code" (+ (* (/ address 16) 68) 52 (% address 16))) (delete-char 1) (insert (hexl-printable-character ch)) - (if (eq address hexl-max-address) - (hexl-goto-address address) - (hexl-goto-address (1+ address))) + (or (eq address hexl-max-address) + (setq address (1+ address))) + (hexl-goto-address address) (setq num (1- num))))) ;; hex conversion @@ -580,6 +611,15 @@ You may also type up to 3 octal digits, to insert a character with that code" nil (setq hexl-mode-map (make-sparse-keymap)) + (define-key hexl-mode-map [left] 'hexl-backward-char) + (define-key hexl-mode-map [right] 'hexl-forward-char) + (define-key hexl-mode-map [up] 'hexl-previous-line) + (define-key hexl-mode-map [down] 'hexl-next-line) + (define-key hexl-mode-map [M-left] 'hexl-backward-short) + (define-key hexl-mode-map [M-right] 'hexl-forward-short) + (define-key hexl-mode-map [next] 'hexl-scroll-up) + (define-key hexl-mode-map [prev] 'hexl-scroll-down) + (define-key hexl-mode-map "\C-a" 'hexl-beginning-of-line) (define-key hexl-mode-map "\C-b" 'hexl-backward-char) (define-key hexl-mode-map "\C-d" 'undefined) @@ -587,7 +627,7 @@ You may also type up to 3 octal digits, to insert a character with that code" (define-key hexl-mode-map "\C-f" 'hexl-forward-char) (if (not (eq (key-binding (char-to-string help-char)) 'help-command)) - (define-key hexl-mode-map help-char 'undefined)) + (define-key hexl-mode-map (char-to-string help-char) 'undefined)) (define-key hexl-mode-map "\C-i" 'hexl-self-insert-command) (define-key hexl-mode-map "\C-j" 'hexl-self-insert-command)