X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-uu.el;h=c3991c3b25b0a6c90f24be8ec3e5ab256e8cb014;hb=0fc7cfe44d8a7e783f48ebd0a91a614f5a67842d;hp=6556af5e03afb1aec71d37bb5c0ab393effe47c6;hpb=c9aef86c3ca1504b71ba25898d188b338b7339af;p=elisp%2Fgnus.git- diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index 6556af5..c3991c3 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -1,13 +1,11 @@ ;;; mm-uu.el -- Return uu stuffs as mm handles -;; Copyright (c) 1998 by Shenghuo Zhu +;; Copyright (c) 1998,99 by Shenghuo Zhu ;; Author: Shenghuo Zhu -;; $Revision: 1.1.2.10 $ -;; Keywords: news postscript uudecode binhex shar +;; Keywords: postscript uudecode binhex shar forward + +;; This file is part of pgnus. -;; This file is not part of GNU Emacs, but the same permissions -;; apply. -;; ;; 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) @@ -17,17 +15,21 @@ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; 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. ;;; Commentary: -;; + ;;; Code: +(require 'mail-parse) +(require 'message) +(require 'nnheader) +(require 'mm-decode) (require 'gnus-mailcap) (eval-and-compile @@ -49,45 +51,97 @@ (defconst mm-uu-postscript-begin-line "^%!PS-") (defconst mm-uu-postscript-end-line "^%%EOF$") -(defconst mm-uu-uu-begin-line "^begin[ \t]+[0-7][0-7][0-7][ \t]+\\(.*\\)$") +(defconst mm-uu-uu-begin-line "^begin[ \t]+[0-7][0-7][0-7][ \t]+") (defconst mm-uu-uu-end-line "^end[ \t]*$") -(defvar mm-uu-decode-function 'uudecode-decode-region) + +(defcustom mm-uu-decode-function 'uudecode-decode-region + "*Function to uudecode. +Internal function is done in elisp by default, therefore decoding may +appear to be horribly slow . You can make Gnus use the external Unix +decoder, such as uudecode." + :type '(choice (item :tag "internal" uudecode-decode-region) + (item :tag "external" uudecode-decode-region-external)) + :group 'gnus-article-mime) (defconst mm-uu-binhex-begin-line "^:...............................................................$") (defconst mm-uu-binhex-end-line ":$") -(defvar mm-uu-binhex-decode-function 'binhex-decode-region) + +(defcustom mm-uu-binhex-decode-function 'binhex-decode-region + "*Function to binhex decode. +Internal function is done in elisp by default, therefore decoding may +appear to be horribly slow . You can make Gnus use the external Unix +decoder, such as hexbin." + :type '(choice (item :tag "internal" binhex-decode-region) + (item :tag "external" binhex-decode-region-external)) + :group 'gnus-article-mime) (defconst mm-uu-shar-begin-line "^#! */bin/sh") -(defconst mm-uu-shar-end-line "^exit 0") +(defconst mm-uu-shar-end-line "^exit 0\\|^$") + +;;; Thanks to Edward J. Sabol and +;;; Peter von der Ah\'e +(defconst mm-uu-forward-begin-line "^-+ \\(?:Start of \\)?Forwarded message") +(defconst mm-uu-forward-end-line "^-+ End of forwarded message") -(defvar mm-uu-begin-line - (concat mm-uu-postscript-begin-line "\\|" - mm-uu-uu-begin-line "\\|" - mm-uu-binhex-begin-line "\\|" - mm-uu-shar-begin-line)) +(defvar mm-uu-begin-line nil) -(defvar mm-uu-identifier-alist - '((?% . postscript) (?b . uu) (?: . binhex) (?# . shar))) +(defconst mm-uu-identifier-alist + '((?% . postscript) (?b . uu) (?: . binhex) (?# . shar) + (?- . forward))) (defvar mm-dissect-disposition "inline" "The default disposition of uu parts. This can be either \"inline\" or \"attachment\".") +(defun mm-uu-configure-p (key val) + (member (cons key val) mm-uu-configure-list)) + +(defun mm-uu-configure (&optional symbol value) + (if symbol (set-default symbol value)) + (setq mm-uu-begin-line nil) + (mapcar '(lambda (type) + (if (mm-uu-configure-p type 'disabled) + nil + (setq mm-uu-begin-line + (concat mm-uu-begin-line + (if mm-uu-begin-line "\\|") + (symbol-value + (intern (concat "mm-uu-" (symbol-name type) + "-begin-line"))))))) + '(uu postscript binhex shar forward))) + +(defcustom mm-uu-configure-list nil + "A list of mm-uu configuration. +To disable dissecting shar codes, for instance, add +`(shar . disabled)' to this list." + :type '(repeat (cons + (choice (item postscript) + (item uu) + (item binhex) + (item shar) + (item forward)) + (choice (item disabled)))) + :group 'gnus-article-mime + :set 'mm-uu-configure) + +(mm-uu-configure) + ;;;### autoload (defun mm-uu-dissect () "Dissect the current buffer and return a list of uu handles." (let (ct ctl cte charset text-start start-char end-char - type file-name end-line result text-plain-type) + type file-name end-line result text-plain-type + start-char-1 end-char-1 + (case-fold-search t)) (save-excursion (save-restriction (mail-narrow-to-head) (when (and (mail-fetch-field "mime-version") (setq ct (mail-fetch-field "content-type"))) (setq cte (message-fetch-field "content-transfer-encoding" t) - ctl (condition-case () (mail-header-parse-content-type ct) - (error nil)) + ctl (ignore-errors (mail-header-parse-content-type ct)) charset (and ctl (mail-content-type-get ctl 'charset))) (if (stringp cte) (setq cte (intern (downcase (mail-header-remove-whitespace @@ -100,28 +154,30 @@ This can be either \"inline\" or \"attachment\".") (if charset (list (cons 'charset charset))))) (while (re-search-forward mm-uu-begin-line nil t) - (beginning-of-line) - (setq start-char (point)) - (forward-line) ;; in case of failure + (setq start-char (match-beginning 0)) (setq type (cdr (assq (aref (match-string 0) 0) mm-uu-identifier-alist))) (setq file-name - (if (eq type 'uu) + (if (and (eq type 'uu) + (looking-at "\\(.+\\)$")) (and (match-string 1) (let ((nnheader-file-name-translation-alist '((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_)))) (nnheader-translate-file-chars (match-string 1)))))) + (forward-line) ;; in case of failure + (setq start-char-1 (point)) (setq end-line (symbol-value (intern (concat "mm-uu-" (symbol-name type) "-end-line")))) - (when (re-search-forward end-line nil t) + (when (and (re-search-forward end-line nil t) + (not (eq (match-beginning 0) (match-end 0)))) + (setq end-char-1 (match-beginning 0)) (forward-line) (setq end-char (point)) (when (or (not (eq type 'binhex)) (setq file-name - (condition-case nil - (binhex-decode-region start-char end-char t) - (error nil)))) + (ignore-errors + (binhex-decode-region start-char end-char t)))) (if (> start-char text-start) (push (mm-make-handle (mm-uu-copy-to-buffer text-start start-char) @@ -132,6 +188,9 @@ This can be either \"inline\" or \"attachment\".") ((eq type 'postscript) (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) '("application/postscript"))) + ((eq type 'forward) + (mm-make-handle (mm-uu-copy-to-buffer start-char-1 end-char-1) + '("message/rfc822"))) ((eq type 'uu) (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) (list (or (and file-name @@ -176,15 +235,18 @@ This can be either \"inline\" or \"attachment\".") (mail-narrow-to-head) (goto-char (point-max))) (forward-line) - (let (type end-line result) - (while (and (not result) (re-search-forward mm-uu-begin-line nil t)) + (let (type end-line result + (case-fold-search t)) + (while (and mm-uu-begin-line + (not result) (re-search-forward mm-uu-begin-line nil t)) (forward-line) (setq type (cdr (assq (aref (match-string 0) 0) mm-uu-identifier-alist))) (setq end-line (symbol-value (intern (concat "mm-uu-" (symbol-name type) "-end-line")))) - (if (re-search-forward end-line nil t) + (if (and (re-search-forward end-line nil t) + (not (eq (match-beginning 0) (match-end 0)))) (setq result t))) result)))