X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fbinhex.el;h=a5f3982d072e4a6c65a567a1f84ac3d4cacaa47a;hp=120821f85eb86166d85952a6c60466a89fc6f60a;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hpb=cb0d937e62fd11aa7c7cb44e3492a0274ef55a52 diff --git a/lisp/binhex.el b/lisp/binhex.el index 120821f85..a5f3982d0 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -1,15 +1,16 @@ -;;; binhex.el --- elisp native binhex decode -;; Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +;;; binhex.el --- decode BinHex-encoded text + +;; Copyright (C) 1998-2016 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: binhex news ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; 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 2, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,15 +18,16 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: -;;; Code: +;; BinHex is a binary-to-text encoding scheme similar to uuencode. +;; The command `binhex-decode-region' decodes BinHex-encoded text, via +;; the external program "hexbin" if that is available, or an Emacs +;; Lisp implementation if not. -(autoload 'executable-find "executable") +;;; Code: (eval-when-compile (require 'cl)) @@ -35,22 +37,28 @@ 'char-int 'identity))) +(defgroup binhex nil + "Decoding of BinHex (binary-to-hexadecimal) data." + :group 'mail + :group 'news) + (defcustom binhex-decoder-program "hexbin" - "*Non-nil value should be a string that names a uu decoder. + "Non-nil value should be a string that names a binhex decoder. The program should expect to read binhex data on its standard input and write the converted data to its standard output." :type 'string - :group 'gnus-extract) + :group 'binhex) (defcustom binhex-decoder-switches '("-d") - "*List of command line flags passed to the command named by binhex-decoder-program." - :group 'gnus-extract + "List of command line flags passed to the command `binhex-decoder-program'." + :group 'binhex :type '(repeat string)) -(defcustom binhex-use-external +(defcustom binhex-use-external (executable-find binhex-decoder-program) - "*Use external binhex program." - :group 'gnus-extract + "Use external binhex program." + :version "22.1" + :group 'binhex :type 'boolean) (defconst binhex-alphabet-decoding-alist @@ -71,23 +79,27 @@ input and write the converted data to its standard output." ;;;###autoload (defconst binhex-begin-line - "^:...............................................................$") + "^:...............................................................$" + "Regular expression matching the start of a BinHex encoded region.") (defconst binhex-body-line "^[^:]...............................................................$") -(defconst binhex-end-line ":$") +(defconst binhex-end-line ":$") ; unused (defvar binhex-temporary-file-directory (cond ((fboundp 'temp-directory) (temp-directory)) ((boundp 'temporary-file-directory) temporary-file-directory) ("/tmp/"))) -(if (featurep 'xemacs) - (defalias 'binhex-insert-char 'insert-char) - (defun binhex-insert-char (char &optional count ignored buffer) - (if (or (null buffer) (eq buffer (current-buffer))) - (insert-char char count) - (with-current-buffer buffer - (insert-char char count))))) +(eval-and-compile + (defalias 'binhex-insert-char + (if (featurep 'xemacs) + 'insert-char + (lambda (char &optional count ignored buffer) + "Insert COUNT copies of CHARACTER into BUFFER." + (if (or (null buffer) (eq buffer (current-buffer))) + (insert-char char count) + (with-current-buffer buffer + (insert-char char count))))))) (defvar binhex-crc-table [0 4129 8258 12387 16516 20645 24774 28903 @@ -213,8 +225,9 @@ If HEADER-ONLY is non-nil only decode header and return filename." (save-excursion (goto-char start) (when (re-search-forward binhex-begin-line end t) - (let (default-enable-multibyte-characters) - (setq work-buffer (generate-new-buffer " *binhex-work*"))) + (setq work-buffer (generate-new-buffer " *binhex-work*")) + (unless (featurep 'xemacs) + (with-current-buffer work-buffer (set-buffer-multibyte nil))) (beginning-of-line) (setq bits 0 counter 0) (while tmp @@ -240,14 +253,13 @@ If HEADER-ONLY is non-nil only decode header and return filename." (setq file-name-length (char-after (point-min)) data-fork-start (+ (point-min) file-name-length 22)))) - (if (and (null header) - (with-current-buffer work-buffer - (>= (buffer-size) data-fork-start))) - (progn - (binhex-verify-crc work-buffer - 1 data-fork-start) - (setq header (binhex-header work-buffer)) - (if header-only (setq tmp nil counter 0)))) + (when (and (null header) + (with-current-buffer work-buffer + (>= (buffer-size) data-fork-start))) + (binhex-verify-crc work-buffer + (point-min) data-fork-start) + (setq header (binhex-header work-buffer)) + (when header-only (setq tmp nil counter 0))) (setq tmp (and tmp (not (eq inputpos end))))) (cond ((= counter 3) @@ -277,7 +289,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (interactive "r") (let ((cbuf (current-buffer)) firstline work-buffer status (file-name (expand-file-name - (concat (binhex-decode-region-internal start end t) + (concat (binhex-decode-region-internal start end t) ".data") binhex-temporary-file-directory))) (save-excursion @@ -315,7 +327,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (defun binhex-decode-region (start end) "Binhex decode region between START and END." (interactive "r") - (if binhex-use-external + (if binhex-use-external (binhex-decode-region-external start end) (binhex-decode-region-internal start end)))