-;;; mm-uu.el -- Return uu stuffs as mm handles
-;; Copyright (c) 1998 by Shenghuo Zhu <zsh@cs.rochester.edu>
+;;; mm-uu.el --- Return uu stuff as mm handles
+;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; $Revision: 1.1.2.9 $
-;; Keywords: news postscript uudecode binhex shar
+;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
+
+;; This file is part of GNU Emacs.
-;; 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)
;; 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:
+(eval-when-compile (require 'cl))
+(require 'mail-parse)
+(require 'nnheader)
+(require 'mm-decode)
(require 'gnus-mailcap)
+(require 'mml2015)
+
+(autoload 'uudecode-decode-region "uudecode")
+(autoload 'uudecode-decode-region-external "uudecode")
+(autoload 'uudecode-decode-region-internal "uudecode")
+
+(autoload 'binhex-decode-region "binhex")
+(autoload 'binhex-decode-region-external "binhex")
+(autoload 'binhex-decode-region-internal "binhex")
+
+(autoload 'yenc-decode-region "yenc")
+(autoload 'yenc-extract-filename "yenc")
-(eval-and-compile
- (autoload 'binhex-decode-region "binhex")
- (autoload 'binhex-decode-region-external "binhex")
- (autoload 'uudecode-decode-region "uudecode")
- (autoload 'uudecode-decode-region-external "uudecode"))
+(defcustom mm-uu-decode-function 'uudecode-decode-region
+ "*Function to uudecode.
+Internal function is done in Lisp by default, therefore decoding may
+appear to be horribly slow. You can make Gnus use an external
+decoder, such as uudecode."
+ :type '(choice
+ (function-item :tag "Auto detect" uudecode-decode-region)
+ (function-item :tag "Internal" uudecode-decode-region-internal)
+ (function-item :tag "External" uudecode-decode-region-external))
+ :group 'gnus-article-mime)
+
+(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 (function-item :tag "Auto detect" binhex-decode-region)
+ (function-item :tag "Internal" binhex-decode-region-internal)
+ (function-item :tag "External" binhex-decode-region-external))
+ :group 'gnus-article-mime)
+
+(defvar mm-uu-yenc-decode-function 'yenc-decode-region)
+
+(defvar mm-uu-pgp-beginning-signature
+ "^-----BEGIN PGP SIGNATURE-----")
+
+(defvar mm-uu-beginning-regexp nil)
+
+(defvar mm-dissect-disposition "inline"
+ "The default disposition of uu parts.
+This can be either \"inline\" or \"attachment\".")
-(defun mm-uu-copy-to-buffer (from to)
- "Copy the contents of the current buffer to a fresh buffer."
+(defvar mm-uu-emacs-sources-regexp "gnu\\.emacs\\.sources"
+ "The regexp of Emacs sources groups.")
+
+(defcustom mm-uu-diff-groups-regexp "gnus\\.commits"
+ "*Regexp matching diff groups."
+ :type 'regexp
+ :group 'gnus-article-mime)
+
+(defvar mm-uu-type-alist
+ '((postscript
+ "^%!PS-"
+ "^%%EOF$"
+ mm-uu-postscript-extract
+ nil)
+ (uu
+ "^begin[ \t]+0?[0-7][0-7][0-7][ \t]+"
+ "^end[ \t]*$"
+ mm-uu-uu-extract
+ mm-uu-uu-filename)
+ (binhex
+ "^:...............................................................$"
+ ":$"
+ mm-uu-binhex-extract
+ nil
+ mm-uu-binhex-filename)
+ (yenc
+ "^=ybegin.*size=[0-9]+.*name=.*$"
+ "^=yend.*size=[0-9]+"
+ mm-uu-yenc-extract
+ mm-uu-yenc-filename)
+ (shar
+ "^#! */bin/sh"
+ "^exit 0$"
+ mm-uu-shar-extract)
+ (forward
+;;; Thanks to Edward J. Sabol <sabol@alderaan.gsfc.nasa.gov> and
+;;; Peter von der Ah\'e <pahe@daimi.au.dk>
+ "^-+ \\(Start of \\)?Forwarded message"
+ "^-+ End \\(of \\)?forwarded message"
+ mm-uu-forward-extract
+ nil
+ mm-uu-forward-test)
+ (gnatsweb
+ "^----gnatsweb-attachment----"
+ nil
+ mm-uu-gnatsweb-extract)
+ (pgp-signed
+ "^-----BEGIN PGP SIGNED MESSAGE-----"
+ "^-----END PGP SIGNATURE-----"
+ mm-uu-pgp-signed-extract
+ nil
+ nil)
+ (pgp-encrypted
+ "^-----BEGIN PGP MESSAGE-----"
+ "^-----END PGP MESSAGE-----"
+ mm-uu-pgp-encrypted-extract
+ nil
+ nil)
+ (pgp-key
+ "^-----BEGIN PGP PUBLIC KEY BLOCK-----"
+ "^-----END PGP PUBLIC KEY BLOCK-----"
+ mm-uu-pgp-key-extract
+ mm-uu-gpg-key-skip-to-last
+ nil)
+ (emacs-sources
+ "^;;;?[ \t]*[^ \t]+\\.el[ \t]*--"
+ "^;;;?[ \t]*\\([^ \t]+\\.el\\)[ \t]+ends here"
+ mm-uu-emacs-sources-extract
+ nil
+ mm-uu-emacs-sources-test)
+ (diff
+ "^Index: "
+ nil
+ mm-uu-diff-extract
+ nil
+ mm-uu-diff-test)))
+
+(defcustom mm-uu-configure-list '((shar . disabled))
+ "A list of mm-uu configuration.
+To disable dissecting shar codes, for instance, add
+`(shar . disabled)' to this list."
+ :type 'alist
+ :options (mapcar (lambda (entry)
+ (list (car entry) '(const disabled)))
+ mm-uu-type-alist)
+ :group 'gnus-article-mime)
+
+(defvar mm-uu-text-plain-type '("text/plain" (charset . gnus-decoded))
+ "MIME type and parameters for text/plain parts.
+`gnus-decoded' is a fake charset, which means no further decoding.")
+
+;; functions
+
+(defsubst mm-uu-type (entry)
+ (car entry))
+
+(defsubst mm-uu-beginning-regexp (entry)
+ (nth 1 entry))
+
+(defsubst mm-uu-end-regexp (entry)
+ (nth 2 entry))
+
+(defsubst mm-uu-function-extract (entry)
+ (nth 3 entry))
+
+(defsubst mm-uu-function-1 (entry)
+ (nth 4 entry))
+
+(defsubst mm-uu-function-2 (entry)
+ (nth 5 entry))
+
+(defun mm-uu-copy-to-buffer (&optional from to)
+ "Copy the contents of the current buffer to a fresh buffer.
+Return that buffer."
(save-excursion
- (let ((obuf (current-buffer)))
+ (let ((obuf (current-buffer))
+ (coding-system
+ ;; Might not exist in non-MULE XEmacs
+ (when (boundp 'buffer-file-coding-system)
+ buffer-file-coding-system)))
(set-buffer (generate-new-buffer " *mm-uu*"))
+ (setq buffer-file-coding-system coding-system)
(insert-buffer-substring obuf from to)
(current-buffer))))
-;;; postscript
+(defun mm-uu-configure-p (key val)
+ (member (cons key val) mm-uu-configure-list))
-(defconst mm-uu-postscript-begin-line "^%!PS-")
-(defconst mm-uu-postscript-end-line "^%%EOF$")
+(defun mm-uu-configure (&optional symbol value)
+ (if symbol (set-default symbol value))
+ (setq mm-uu-beginning-regexp nil)
+ (mapcar (lambda (entry)
+ (if (mm-uu-configure-p (mm-uu-type entry) 'disabled)
+ nil
+ (setq mm-uu-beginning-regexp
+ (concat mm-uu-beginning-regexp
+ (if mm-uu-beginning-regexp "\\|")
+ (mm-uu-beginning-regexp entry)))))
+ mm-uu-type-alist))
-(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)
+(mm-uu-configure)
-(defconst mm-uu-binhex-begin-line
- "^:...............................................................$")
-(defconst mm-uu-binhex-end-line ":$")
-(defvar mm-uu-binhex-decode-function 'binhex-decode-region)
+(eval-when-compile
+ (defvar file-name)
+ (defvar start-point)
+ (defvar end-point)
+ (defvar entry))
-(defconst mm-uu-shar-begin-line "^#! */bin/sh")
-(defconst mm-uu-shar-end-line "^exit 0")
+(defun mm-uu-uu-filename ()
+ (if (looking-at ".+")
+ (setq file-name
+ (let ((nnheader-file-name-translation-alist
+ '((?/ . ?,) (?\ . ?_) (?* . ?_) (?$ . ?_))))
+ (nnheader-translate-file-chars (match-string 0))))))
-(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))
+(defun mm-uu-binhex-filename ()
+ (setq file-name
+ (ignore-errors
+ (binhex-decode-region start-point end-point t))))
-(defvar mm-uu-identifier-alist
- '((?% . postscript) (?b . uu) (?: . binhex) (?# . shar)))
+(defun mm-uu-yenc-filename ()
+ (goto-char start-point)
+ (setq file-name
+ (ignore-errors
+ (yenc-extract-filename))))
-(defvar mm-dissect-disposition "inline"
- "The default disposition of uu parts.
-This can be either \"inline\" or \"attachment\".")
+(defun mm-uu-forward-test ()
+ (save-excursion
+ (goto-char start-point)
+ (forward-line)
+ (looking-at "[\r\n]*[a-zA-Z][a-zA-Z0-9-]*:")))
+
+(defun mm-uu-postscript-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ '("application/postscript")))
+
+(defun mm-uu-emacs-sources-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ '("application/emacs-lisp")
+ nil nil
+ (list mm-dissect-disposition
+ (cons 'filename file-name))))
+
+(eval-when-compile
+ (defvar gnus-newsgroup-name))
+
+(defun mm-uu-emacs-sources-test ()
+ (setq file-name (match-string 1))
+ (and gnus-newsgroup-name
+ mm-uu-emacs-sources-regexp
+ (string-match mm-uu-emacs-sources-regexp gnus-newsgroup-name)))
+
+(defun mm-uu-diff-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ '("text/x-patch")))
+
+(defun mm-uu-diff-test ()
+ (and gnus-newsgroup-name
+ mm-uu-diff-groups-regexp
+ (string-match mm-uu-diff-groups-regexp gnus-newsgroup-name)))
+
+(defun mm-uu-forward-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer
+ (progn (goto-char start-point) (forward-line) (point))
+ (progn (goto-char end-point) (forward-line -1) (point)))
+ '("message/rfc822" (charset . gnus-decoded))))
+
+(defun mm-uu-uu-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ (list (or (and file-name
+ (string-match "\\.[^\\.]+$"
+ file-name)
+ (mailcap-extension-to-mime
+ (match-string 0 file-name)))
+ "application/octet-stream"))
+ 'x-uuencode nil
+ (if (and file-name (not (equal file-name "")))
+ (list mm-dissect-disposition
+ (cons 'filename file-name)))))
+
+(defun mm-uu-binhex-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ (list (or (and file-name
+ (string-match "\\.[^\\.]+$" file-name)
+ (mailcap-extension-to-mime
+ (match-string 0 file-name)))
+ "application/octet-stream"))
+ 'x-binhex nil
+ (if (and file-name (not (equal file-name "")))
+ (list mm-dissect-disposition
+ (cons 'filename file-name)))))
+
+(defun mm-uu-yenc-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ (list (or (and file-name
+ (string-match "\\.[^\\.]+$" file-name)
+ (mailcap-extension-to-mime
+ (match-string 0 file-name)))
+ "application/octet-stream"))
+ 'x-yenc nil
+ (if (and file-name (not (equal file-name "")))
+ (list mm-dissect-disposition
+ (cons 'filename file-name)))))
+
+
+(defun mm-uu-shar-extract ()
+ (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ '("application/x-shar")))
+
+(defun mm-uu-gnatsweb-extract ()
+ (save-restriction
+ (goto-char start-point)
+ (forward-line)
+ (narrow-to-region (point) end-point)
+ (mm-dissect-buffer t)))
-;;;### autoload
+(defun mm-uu-pgp-signed-test (&rest rest)
+ (and
+ mml2015-use
+ (mml2015-clear-verify-function)
+ (cond
+ ((eq mm-verify-option 'never) nil)
+ ((eq mm-verify-option 'always) t)
+ ((eq mm-verify-option 'known) t)
+ (t (y-or-n-p "Verify pgp signed part? ")))))
-(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)
+(eval-when-compile
+ (defvar gnus-newsgroup-charset))
+
+(defun mm-uu-pgp-signed-extract-1 (handles ctl)
+ (let ((buf (mm-uu-copy-to-buffer (point-min) (point-max))))
+ (with-current-buffer buf
+ (if (mm-uu-pgp-signed-test)
+ (progn
+ (mml2015-clean-buffer)
+ (let ((coding-system-for-write (or gnus-newsgroup-charset
+ 'iso-8859-1)))
+ (funcall (mml2015-clear-verify-function))))
+ (when (and mml2015-use (null (mml2015-clear-verify-function)))
+ (mm-set-handle-multipart-parameter
+ mm-security-handle 'gnus-details
+ (format "Clear verification not supported by `%s'.\n" mml2015-use))))
+ (goto-char (point-min))
+ (if (search-forward "\n\n" nil t)
+ (delete-region (point-min) (point)))
+ (if (re-search-forward mm-uu-pgp-beginning-signature nil t)
+ (delete-region (match-beginning 0) (point-max)))
+ (goto-char (point-min))
+ (while (re-search-forward "^- " nil t)
+ (replace-match "" t t)
+ (forward-line 1)))
+ (list (mm-make-handle buf mm-uu-text-plain-type))))
+
+(defun mm-uu-pgp-signed-extract ()
+ (let ((mm-security-handle (list (format "multipart/signed"))))
+ (mm-set-handle-multipart-parameter
+ mm-security-handle 'protocol "application/x-gnus-pgp-signature")
+ (save-restriction
+ (narrow-to-region start-point end-point)
+ (add-text-properties 0 (length (car mm-security-handle))
+ (list 'buffer (mm-uu-copy-to-buffer))
+ (car mm-security-handle))
+ (setcdr mm-security-handle
+ (mm-uu-pgp-signed-extract-1 nil
+ mm-security-handle)))
+ mm-security-handle))
+
+(defun mm-uu-pgp-encrypted-test (&rest rest)
+ (and
+ mml2015-use
+ (mml2015-clear-decrypt-function)
+ (cond
+ ((eq mm-decrypt-option 'never) nil)
+ ((eq mm-decrypt-option 'always) t)
+ ((eq mm-decrypt-option 'known) t)
+ (t (y-or-n-p "Decrypt pgp encrypted part? ")))))
+
+(defun mm-uu-pgp-encrypted-extract-1 (handles ctl)
+ (let ((buf (mm-uu-copy-to-buffer (point-min) (point-max))))
+ (if (mm-uu-pgp-encrypted-test)
+ (with-current-buffer buf
+ (mml2015-clean-buffer)
+ (funcall (mml2015-clear-decrypt-function))))
+ (list (mm-make-handle buf mm-uu-text-plain-type))))
+
+(defun mm-uu-pgp-encrypted-extract ()
+ (let ((mm-security-handle (list (format "multipart/encrypted"))))
+ (mm-set-handle-multipart-parameter
+ mm-security-handle 'protocol "application/x-gnus-pgp-encrypted")
+ (save-restriction
+ (narrow-to-region start-point end-point)
+ (add-text-properties 0 (length (car mm-security-handle))
+ (list 'buffer (mm-uu-copy-to-buffer))
+ (car mm-security-handle))
+ (setcdr mm-security-handle
+ (mm-uu-pgp-encrypted-extract-1 nil
+ mm-security-handle)))
+ mm-security-handle))
+
+(defun mm-uu-gpg-key-skip-to-last ()
+ (let ((point (point))
+ (end-regexp (mm-uu-end-regexp entry))
+ (beginning-regexp (mm-uu-beginning-regexp entry)))
+ (when (and end-regexp
+ (not (mm-uu-configure-p (mm-uu-type entry) 'disabled)))
+ (while (re-search-forward end-regexp nil t)
+ (skip-chars-forward " \t\n\r")
+ (if (looking-at beginning-regexp)
+ (setq point (match-end 0)))))
+ (goto-char point)))
+
+(defun mm-uu-pgp-key-extract ()
+ (let ((buf (mm-uu-copy-to-buffer start-point end-point)))
+ (mm-make-handle buf
+ '("application/pgp-keys"))))
+
+;;;###autoload
+(defun mm-uu-dissect (&optional noheader mime-type)
+ "Dissect the current buffer and return a list of uu handles.
+The optional NOHEADER means there's no header in the buffer.
+MIME-TYPE specifies a MIME type and parameters, which defaults to the
+value of `mm-uu-text-plain-type'."
+ (let ((case-fold-search t)
+ (mm-uu-text-plain-type (or mime-type mm-uu-text-plain-type))
+ text-start start-point end-point file-name result entry func)
(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))
- charset (and ctl (mail-content-type-get ctl 'charset)))
- (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
- (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 type (cdr (assq (aref (match-string 0) 0)
- mm-uu-identifier-alist)))
- (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)
- "-end-line"))))
- (when (re-search-forward end-line nil t)
- (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))))
- (if (> start-char text-start)
- (push
- (mm-make-handle (mm-uu-copy-to-buffer text-start start-char)
- text-plain-type cte)
- result))
- (push
- (cond
- ((eq type 'postscript)
- (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
- '("application/postscript")))
- ((eq type 'uu)
- (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
- (match-string 0 file-name)))
- "application/octet-stream"))
- 'x-uuencode nil
- (if (and file-name (not (equal 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)
- (list (or (and file-name
- (string-match "\\.[^\\.]+$" file-name)
- (mailcap-extension-to-mime
- (match-string 0 file-name)))
- "application/octet-stream"))
- 'x-binhex nil
- (if (and file-name (not (equal 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"))))
- result)
- (setq text-start end-char))))
+ (goto-char (point-min))
+ (cond
+ (noheader)
+ ((looking-at "\n")
+ (forward-line))
+ ((search-forward "\n\n" nil t)
+ t)
+ (t (goto-char (point-max))))
+ (setq text-start (point))
+ (while (re-search-forward mm-uu-beginning-regexp nil t)
+ (setq start-point (match-beginning 0))
+ (let ((alist mm-uu-type-alist)
+ (beginning-regexp (match-string 0)))
+ (while (not entry)
+ (if (string-match (mm-uu-beginning-regexp (car alist))
+ beginning-regexp)
+ (setq entry (car alist))
+ (pop alist))))
+ (if (setq func (mm-uu-function-1 entry))
+ (funcall func))
+ (forward-line);; in case of failure
+ (when (and (not (mm-uu-configure-p (mm-uu-type entry) 'disabled))
+ (let ((end-regexp (mm-uu-end-regexp entry)))
+ (if (not end-regexp)
+ (or (setq end-point (point-max)) t)
+ (prog1
+ (re-search-forward end-regexp nil t)
+ (forward-line)
+ (setq end-point (point)))))
+ (or (not (setq func (mm-uu-function-2 entry)))
+ (funcall func)))
+ (if (and (> start-point text-start)
+ (progn
+ (goto-char text-start)
+ (re-search-forward "." start-point t)))
+ (push
+ (mm-make-handle (mm-uu-copy-to-buffer text-start start-point)
+ mm-uu-text-plain-type)
+ result))
+ (push
+ (funcall (mm-uu-function-extract entry))
+ result)
+ (goto-char (setq text-start end-point))))
(when result
- (if (> (point-max) (1+ text-start))
+ (if (and (> (point-max) (1+ text-start))
+ (save-excursion
+ (goto-char text-start)
+ (re-search-forward "." nil t)))
(push
(mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
- text-plain-type cte)
+ mm-uu-text-plain-type)
result))
(setq result (cons "multipart/mixed" (nreverse result))))
result)))
-;;;### autoload
-(defun mm-uu-test ()
- "Check whether the current buffer contains uu stuffs."
- (save-excursion
- (save-restriction
- (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))
- (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)
- (setq result t)))
- result)))
+(defun mm-uu-dissect-text-parts (handle)
+ "Dissect text parts and put uu handles into HANDLE."
+ (let ((buffer (mm-handle-buffer handle))
+ type children)
+ (cond ((stringp buffer)
+ (mapc 'mm-uu-dissect-text-parts (cdr handle)))
+ ((bufferp buffer)
+ (when (and (setq type (mm-handle-media-type handle))
+ (stringp type)
+ (string-match "\\`text/" type)
+ (with-current-buffer buffer
+ (setq children
+ (mm-uu-dissect t (mm-handle-type handle)))))
+ (kill-buffer buffer)
+ (setcar handle (car children))
+ (setcdr handle (cdr children))))
+ (t
+ (mapc 'mm-uu-dissect-text-parts handle)))))
(provide 'mm-uu)