:group 'hexl)
(defcustom hexlify-command
- (format "%s%s %s" exec-directory hexl-program hexl-options)
+ (format "%s %s"
+ (shell-quote-argument
+ (expand-file-name hexl-program exec-directory))
+ hexl-options)
"The command to use to hexlify a buffer."
:type 'string
:group 'hexl)
(defcustom dehexlify-command
- (format "%s%s -de %s" exec-directory hexl-program hexl-options)
+ (format "%s -de %s"
+ (shell-quote-argument
+ (expand-file-name hexl-program exec-directory))
+ hexl-options)
"The command to use to unhexlify a buffer."
:type 'string
:group 'hexl)
;;;###autoload
(defun hexl-mode (&optional arg)
- "\\<hexl-mode-map>
-A major mode for editing binary files in hex dump format.
+ "\\<hexl-mode-map>A mode for editing binary files in hex dump format.
+This is not an ordinary major mode; it alters some aspects
+if the current mode's behavior, but not all; also, you can exit
+Hexl mode and return to the previous mode using `hexl-mode-exit'.
This function automatically converts a buffer into the hexl format
using the function `hexlify-buffer'.
Note: saving the file with any of the usual Emacs commands
will actually convert it back to binary format while saving.
-You can use \\[hexl-find-file] to visit a file in hexl-mode.
+You can use \\[hexl-find-file] to visit a file in Hexl mode.
\\[describe-bindings] for advanced commands."
(interactive "p")
- (if (eq major-mode 'hexl-mode)
- (error "You are already in hexl mode")
-
+ (unless (eq major-mode 'hexl-mode)
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
(original-point (1- (point)))
(run-hooks 'hexl-mode-hook))
(defun hexl-after-revert-hook ()
+ (setq hexl-max-address (1- (buffer-size)))
(hexlify-buffer)
(set-buffer-modified-p nil))
hexl-address))
(defun hexl-address-to-marker (address)
- "Return marker for ADDRESS."
+ "Return buffer position for ADDRESS."
(interactive "nAddress: ")
(+ (* (/ address 16) 68) 11 (/ (* (% address 16) 5) 2)))
'raw-text-unix)
(t 'no-conversion))))
(buffer-undo-list t))
- (shell-command-on-region (point-min) (point-max) hexlify-command t)))
+ (shell-command-on-region (point-min) (point-max) hexlify-command t)
+ (if (> (point) (hexl-address-to-marker hexl-max-address))
+ (hexl-goto-address hexl-max-address))))
(defun dehexlify-buffer ()
"Convert a hexl format buffer to binary.
(error "Hex number out of range")
(hexl-insert-char num arg))))
+(defun hexl-insert-hex-string (str arg)
+ "Insert hexadecimal string STR at point ARG times.
+Embedded whitespace, dashes, and periods in the string are ignored."
+ (interactive "sHex string: \np")
+ (setq str (replace-regexp-in-string "[- \t.]" "" str))
+ (let ((chars '()))
+ (let ((len (length str))
+ (idx 0))
+ (if (eq (logand len 1) 1)
+ (let ((num (hexl-hex-string-to-integer (substring str 0 1))))
+ (setq chars (cons num chars))
+ (setq idx 1)))
+ (while (< idx len)
+ (let* ((nidx (+ idx 2))
+ (num (hexl-hex-string-to-integer (substring str idx nidx))))
+ (setq chars (cons num chars))
+ (setq idx nidx))))
+ (setq chars (nreverse chars))
+ (while (> arg 0)
+ (let ((chars chars))
+ (while chars
+ (hexl-insert-char (car chars) 1)
+ (setq chars (cdr chars))))
+ (setq arg (- arg 1)))))
+
(defun hexl-insert-decimal-char (arg)
"Insert a ASCII char ARG times at point for a given decimal number."
(interactive "p")