;;; mm-uu.el -- Return uu stuffs as mm handles
-;; Copyright (c) 1998 by Shenghuo Zhu <zsh@cs.rochester.edu>
+;; Copyright (c) 1998,99 by Shenghuo Zhu
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; $Revision: 1.1.1.7 $
-;; Keywords: news postscript uudecode binhex shar
-
-;; This file is not part of GNU Emacs, but the same permissions
-;; apply.
-;;
+;; Keywords: postscript uudecode binhex shar forward
+
+;; This file is part of pgnus.
+
;; 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)
;; 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
(autoload 'binhex-decode-region "binhex")
(autoload 'binhex-decode-region-external "binhex")
(defconst mm-uu-shar-begin-line "^#! */bin/sh")
(defconst mm-uu-shar-end-line "^exit 0")
-(defvar mm-uu-begin-line
+;;; Thanks to Edward J. Sabol <sabol@alderaan.gsfc.nasa.gov> and
+;;; Peter von der Ah\'e <pahe@daimi.au.dk>
+(defconst mm-uu-forward-begin-line "^-+ \\(Start of \\)?Forwarded message")
+(defconst mm-uu-forward-end-line "^-+ End of forwarded message")
+
+(defconst 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))
+ mm-uu-shar-begin-line "\\|"
+ mm-uu-forward-begin-line))
-(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\".")
;;;### 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)
+ (let (ct ctl cte charset text-start start-char end-char
+ 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)
+ (if (stringp cte)
(setq cte (intern (downcase (mail-header-remove-whitespace
(mail-header-remove-comments
cte)))))))
(goto-char (point-max)))
(forward-line)
(setq text-start (point)
- text-plain-type (cons "text/plain"
- (if charset
+ text-plain-type (cons "text/plain"
+ (if charset
(list (cons 'charset charset)))))
(while (re-search-forward mm-uu-begin-line nil t)
- (beginning-of-line)
- (setq start-char (point))
+ (setq start-char (match-beginning 0))
(forward-line) ;; in case of failure
- (setq type (cdr (assq (aref (match-string 0) 0)
+ (setq start-char-1 (point))
+ (setq type (cdr (assq (aref (match-string 0) 0)
mm-uu-identifier-alist)))
- (setq file-name
+ (setq file-name
(if (eq type 'uu)
(and (match-string 1)
(let ((nnheader-file-name-translation-alist
'((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_))))
(nnheader-translate-file-chars (match-string 1))))))
- (setq end-line (symbol-value
- (intern (concat "mm-uu-" (symbol-name type)
+ (setq end-line (symbol-value
+ (intern (concat "mm-uu-" (symbol-name type)
"-end-line"))))
(when (re-search-forward end-line nil t)
+ (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))))
+ (setq file-name
+ (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)
- text-plain-type cte)
+ (mm-make-handle (mm-uu-copy-to-buffer text-start start-char)
+ text-plain-type cte)
result))
- (push
+ (push
(cond
((eq type 'postscript)
- (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
+ (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)
+ (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
(list (or (and file-name
- (string-match "\\.[^\\.]+$" file-name)
- (mailcap-extension-to-mime
+ (string-match "\\.[^\\.]+$" file-name)
+ (mailcap-extension-to-mime
(match-string 0 file-name)))
"application/octet-stream"))
- mm-uu-decode-function nil
+ 'x-uuencode nil
(if (and file-name (not (equal file-name "")))
- (list "inline" (cons 'filename file-name)))))
+ (list mm-dissect-disposition
+ (cons 'filename file-name)))))
((eq type 'binhex)
- (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
+ (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
(list (or (and file-name
- (string-match "\\.[^\\.]+$" file-name)
- (mailcap-extension-to-mime
+ (string-match "\\.[^\\.]+$" file-name)
+ (mailcap-extension-to-mime
(match-string 0 file-name)))
"application/octet-stream"))
- mm-uu-binhex-decode-function nil
+ 'x-binhex nil
(if (and file-name (not (equal file-name "")))
- (list "inline" (cons 'filename file-name)))))
+ (list mm-dissect-disposition
+ (cons 'filename file-name)))))
((eq type 'shar)
- (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
- '("application/x-shar"))))
+ (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
+ '("application/x-shar"))))
result)
(setq text-start end-char))))
(when result
(if (> (point-max) (1+ text-start))
(push
- (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
- text-plain-type cte)
+ (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
+ text-plain-type cte)
result))
(setq result (cons "multipart/mixed" (nreverse result))))
result)))
(mail-narrow-to-head)
(goto-char (point-max)))
(forward-line)
- (let (type end-line result)
+ (let (type end-line result
+ (case-fold-search t))
(while (and (not result) (re-search-forward mm-uu-begin-line nil t))
- (forward-line)
- (setq type (cdr (assq (aref (match-string 0) 0)
+ (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)
+ (setq end-line (symbol-value
+ (intern (concat "mm-uu-" (symbol-name type)
"-end-line"))))
(if (re-search-forward end-line nil t)
(setq result t)))
projects / elisp / gnus.git- / blobdiff