X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime.el;h=9dc2fcc5b74b6404fa5f1bf55b279141a867cbd5;hb=6260b782ec94886678bc08ecf41d7fa91fa6c9c5;hp=e6d0fb9a64a6e6bdb14d85fef757711d97afce7d;hpb=bc080c5254c93bfa357d9026e8732fdff451e966;p=elisp%2Fflim.git

diff --git a/mime.el b/mime.el
index e6d0fb9..9dc2fcc 100644
--- a/mime.el
+++ b/mime.el
@@ -1,8 +1,8 @@
 ;;; mime.el --- MIME library module
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of FLIM (Faithful Library about Internet Message).
@@ -19,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -29,11 +29,12 @@
 (require 'mime-def)
 (require 'eword-decode)
 
-(autoload 'eword-encode-field "eword-encode"
-  "Encode header field STRING, and return the result.")
-(autoload 'eword-encode-header "eword-encode"
-  "Encode header fields to network representation, such as MIME encoded-word.")
+(eval-when-compile (require 'mmgeneric))
+
+(eval-and-compile
 
+(autoload 'mime-encode-header-in-buffer "eword-encode"
+  "Encode header fields to network representation, such as MIME encoded-word.")
 
 (autoload 'mime-parse-Content-Type "mime-parse"
   "Parse STRING as field-body of Content-Type field.")
@@ -53,76 +54,57 @@ and return parsed it.")
   "Read field-body of Content-Transfer-Encoding field from
 current-buffer, and return it.")
 
-(autoload 'mime-parse-message "mime-parse"
-  "Parse current-buffer as a MIME message.")
+(autoload 'mime-parse-msg-id "mime-parse"
+  "Parse TOKENS as msg-id of Content-Id or Message-Id field.")
+
+(autoload 'mime-uri-parse-cid "mime-parse"
+  "Parse STRING as cid URI.")
 
 (autoload 'mime-parse-buffer "mime-parse"
   "Parse BUFFER as a MIME message.")
 
+)
+
+(autoload 'mime-encode-field-body "eword-encode"
+  "Encode FIELD-BODY as FIELD-NAME, and return the result.")
+
 
 ;;; @ Entity Representation and Implementation
 ;;;
 
-(defvar mime-entity-implementation-alist nil)
-
-(defsubst mime-find-function (service type)
-  (let ((imps (cdr (assq type mime-entity-implementation-alist))))
-    (if imps
-	(let ((func (cdr (assq service imps))))
-	  (unless func
-	    (setq func (intern (format "mm%s-%s" type service)))
-	    (set-alist 'mime-entity-implementation-alist
-		       type (put-alist service func imps))
-	    )
-	  func)
-      (let ((prefix (format "mm%s" type)))
-	(require (intern prefix))
-	(let ((func (intern (format "%s-%s" prefix service))))
-	  (set-alist 'mime-entity-implementation-alist
-		     type
-		     (list (cons service func)))
-	  func)))))
-
-(defsubst mime-entity-function (entity service)
-  (mime-find-function service
-		      (mime-entity-representation-type-internal entity)))
-
-(defsubst mime-entity-send (entity service &rest args)
-  (apply (mime-find-function
-	  service (mime-entity-representation-type-internal entity))
-	 entity
-	 args))
+(defmacro mime-entity-send (entity message &rest args)
+  `(luna-send ,entity ',(intern (format "mime-%s" (eval message))) ,@args))
 
 (defun mime-open-entity (type location)
   "Open an entity and return it.
 TYPE is representation-type.
 LOCATION is location of entity.  Specification of it is depended on
 representation-type."
-  (funcall (mime-find-function 'open-entity type) location)
-  )
+  (require (intern (format "mm%s" type)))
+  (luna-make-entity (mm-expand-class-name type) :location location))
 
-(defun mime-entity-cooked-p (entity)
-  "Return non-nil if contents of ENTITY has been already code-converted."
-  (funcall (mime-entity-function entity 'cooked-p))
-  )
+(luna-define-generic mime-entity-cooked-p (entity)
+  "Return non-nil if contents of ENTITY has been already code-converted.")
 
 
 ;;; @ Entity as node of message
 ;;;
 
-(defalias 'mime-entity-children	'mime-entity-children-internal)
+(defun mime-entity-children (entity)
+  "Return list of entities included in the ENTITY."
+  (or (mime-entity-children-internal entity)
+      (luna-send entity 'mime-entity-children entity)))
 
-(defalias 'mime-entity-node-id 'mime-entity-node-id-internal)
+(defun mime-entity-node-id (entity)
+  "Return node-id of ENTITY."
+  (mime-entity-node-id-internal entity))
 
 (defun mime-entity-number (entity)
   "Return entity-number of ENTITY."
   (reverse (mime-entity-node-id-internal entity)))
 
-(defun mime-find-entity-from-number (entity-number &optional message)
-  "Return entity from ENTITY-NUMBER in MESSAGE.
-If MESSAGE is not specified, `mime-message-structure' is used."
-  (or message
-      (setq message mime-message-structure))
+(defun mime-find-entity-from-number (entity-number message)
+  "Return entity from ENTITY-NUMBER in MESSAGE."
   (let ((sn (car entity-number)))
     (if (null sn)
 	message
@@ -132,231 +114,276 @@ If MESSAGE is not specified, `mime-message-structure' is used."
 	  ))
       )))
 
-(defun mime-find-entity-from-node-id (entity-node-id &optional message)
-  "Return entity from ENTITY-NODE-ID in MESSAGE.
-If MESSAGE is not specified, `mime-message-structure' is used."
+(defun mime-find-entity-from-node-id (entity-node-id message)
+  "Return entity from ENTITY-NODE-ID in MESSAGE."
   (mime-find-entity-from-number (reverse entity-node-id) message))
 
+(defun mime-find-entity-from-content-id (cid message)
+  "Return entity from CID in MESSAGE."
+  (if (equal cid (mime-entity-read-field message "Content-Id"))
+      message
+    (let ((children (mime-entity-children message))
+	  ret)
+      (while (and children
+		  (null (setq ret (mime-find-entity-from-content-id
+				   cid (car children)))))
+	(setq children (cdr children)))
+      ret)))
+
 (defun mime-entity-parent (entity &optional message)
   "Return mother entity of ENTITY.
-If MESSAGE is not specified, `mime-message-structure' in the buffer of
-ENTITY is used."
-  (mime-find-entity-from-node-id
-   (cdr (mime-entity-node-id entity))
-   (or message
-       (save-excursion
-	 (set-buffer (mime-entity-buffer entity))
-	 mime-message-structure))))
+If MESSAGE is specified, it is regarded as root entity."
+  (if (equal entity message)
+      nil
+    (mime-entity-parent-internal entity)))
 
-(defun mime-root-entity-p (entity)
-  "Return t if ENTITY is root-entity (message)."
-  (null (mime-entity-node-id entity)))
+(defun mime-root-entity-p (entity &optional message)
+  "Return t if ENTITY is root-entity (message).
+If MESSAGE is specified, it is regarded as root entity."
+  (null (mime-entity-parent entity message)))
 
+(defun mime-find-root-entity (entity)
+  "Return root entity of ENTITY."
+  (while (not (mime-root-entity-p entity))
+    (setq entity (mime-entity-parent entity)))
+  entity)
 
-;;; @ Entity Buffer
+
+;;; @ Header buffer (obsolete)
 ;;;
 
-(defun mime-entity-buffer (entity)
-  (or (mime-entity-buffer-internal entity)
-      (mime-entity-send entity 'entity-buffer)))
+;; (luna-define-generic mime-entity-header-buffer (entity))
+
+;; (luna-define-generic mime-goto-header-start-point (entity)
+;;   "Set buffer and point to header-start-position of ENTITY.")
+
+;; (luna-define-generic mime-entity-header-start-point (entity)
+;;   "Return header-start-position of ENTITY.")
+
+;; (luna-define-generic mime-entity-header-end-point (entity)
+;;   "Return header-end-position of ENTITY.")
 
-(defun mime-entity-point-min (entity)
-  (mime-entity-send entity 'entity-point-min))
+;; (make-obsolete 'mime-entity-header-buffer "don't use it.")
+;; (make-obsolete 'mime-goto-header-start-point "don't use it.")
+;; (make-obsolete 'mime-entity-header-start-point "don't use it.")
+;; (make-obsolete 'mime-entity-header-end-point "don't use it.")
+
+
+;;; @ Body buffer (obsolete)
+;;;
 
-(defun mime-entity-point-max (entity)
-  (mime-entity-send entity 'entity-point-max))
+;; (luna-define-generic mime-entity-body-buffer (entity))
 
-(defun mime-entity-header-start (entity)
-  (or (mime-entity-header-start-internal entity)
-      (mime-entity-send entity 'entity-header-start)))
+;; (luna-define-generic mime-goto-body-start-point (entity)
+;;   "Set buffer and point to body-start-position of ENTITY.")
 
-(defun mime-entity-header-end (entity)
-  (or (mime-entity-header-end-internal entity)
-      (mime-entity-send entity 'entity-header-end)))
+;; (luna-define-generic mime-goto-body-end-point (entity)
+;;   "Set buffer and point to body-end-position of ENTITY.")
 
-(defun mime-entity-body-start (entity)
-  (or (mime-entity-body-start-internal entity)
-      (mime-entity-send entity 'entity-body-start)))
+;; (luna-define-generic mime-entity-body-start-point (entity)
+;;   "Return body-start-position of ENTITY.")
 
-(defun mime-entity-body-end (entity)
-  (or (mime-entity-body-end-internal entity)
-      (mime-entity-send entity 'entity-body-end)))
+;; (luna-define-generic mime-entity-body-end-point (entity)
+;;   "Return body-end-position of ENTITY.")
 
+;; (defalias 'mime-entity-body-start 'mime-entity-body-start-point)
+;; (defalias 'mime-entity-body-end 'mime-entity-body-end-point)
 
-;;; @ Entity Header
+;; (make-obsolete 'mime-entity-body-buffer "don't use it.")
+;; (make-obsolete 'mime-goto-body-start-point "don't use it.")
+;; (make-obsolete 'mime-goto-body-end-point "don't use it.")
+;; (make-obsolete 'mime-entity-body-start-point "don't use it.")
+;; (make-obsolete 'mime-entity-body-end-point "don't use it.")
+;; (make-obsolete 'mime-entity-body-start "don't use it.")
+;; (make-obsolete 'mime-entity-body-end "don't use it.")
+
+
+;;; @ Entity buffer (obsolete)
+;;;
+
+;; (luna-define-generic mime-entity-buffer (entity))
+;; (make-obsolete 'mime-entity-buffer "don't use it.")
+
+;; (luna-define-generic mime-entity-point-min (entity))
+;; (make-obsolete 'mime-entity-point-min "don't use it.")
+
+;; (luna-define-generic mime-entity-point-max (entity))
+;; (make-obsolete 'mime-entity-point-max "don't use it.")
+
+
+;;; @ Entity
 ;;;
 
-(defun mime-fetch-field (field-name &optional entity)
-  (or (symbolp field-name)
-      (setq field-name (intern (capitalize (capitalize field-name)))))
-  (or entity
-      (setq entity mime-message-structure))
-  (let* ((header (mime-entity-original-header-internal entity))
-	 (field-body (cdr (assq field-name header))))
-    (or field-body
-	(progn
-	  (if (setq field-body
-		    (mime-entity-send entity 'fetch-field
-				      (symbol-name field-name)))
-	      (mime-entity-set-original-header-internal
-	       entity (put-alist field-name field-body header))
-	    )
-	  field-body))))
-
-(defalias 'mime-entity-content-type 'mime-entity-content-type-internal)
+(luna-define-generic mime-insert-entity (entity)
+  "Insert header and body of ENTITY at point.")
+
+(luna-define-generic mime-write-entity (entity filename)
+  "Write header and body of ENTITY into FILENAME.")
+
+
+;;; @ Entity Body
+;;;
+
+(luna-define-generic mime-entity-body (entity)
+  "Return network representation of ENTITY body.")
+
+(luna-define-generic mime-insert-entity-body (entity)
+  "Insert network representation of ENTITY body at point.")
+
+(luna-define-generic mime-write-entity-body (entity filename)
+  "Write body of ENTITY into FILENAME.")
+
+
+;;; @ Entity Content
+;;;
+
+(luna-define-generic mime-entity-content (entity)
+  "Return content of ENTITY as byte sequence (string).")
+
+(luna-define-generic mime-insert-entity-content (entity)
+  "Insert content of ENTITY at point.")
+
+(luna-define-generic mime-write-entity-content (entity filename)
+  "Write content of ENTITY into FILENAME.")
+
+(luna-define-generic mime-insert-text-content (entity)
+  "Insert decoded text body of ENTITY.")
+
+
+;;; @ Header fields
+;;;
+
+(luna-define-generic mime-entity-fetch-field (entity field-name)
+  "Return the value of the ENTITY's header field whose type is FIELD-NAME.")
+
+;; (defun mime-fetch-field (field-name &optional entity)
+;;   "Return the value of the ENTITY's header field whose type is FIELD-NAME."
+;;   (if (symbolp field-name)
+;;       (setq field-name (symbol-name field-name))
+;;     )
+;;   (or entity
+;;       (setq entity mime-message-structure))
+;;   (mime-entity-fetch-field entity field-name)
+;;   )
+;; (make-obsolete 'mime-fetch-field 'mime-entity-fetch-field)
+
+(defun mime-entity-content-type (entity)
+  "Return content-type of ENTITY."
+  (or (mime-entity-content-type-internal entity)
+      (let ((ret (mime-entity-fetch-field entity "Content-Type")))
+	(if ret
+	    (mime-entity-set-content-type-internal
+	     entity (mime-parse-Content-Type ret))
+	  ))))
 
 (defun mime-entity-content-disposition (entity)
+  "Return content-disposition of ENTITY."
   (or (mime-entity-content-disposition-internal entity)
-      (let ((ret (mime-fetch-field 'Content-Disposition entity)))
+      (let ((ret (mime-entity-fetch-field entity "Content-Disposition")))
 	(if ret
-	    (let ((disposition (mime-parse-Content-Disposition ret)))
-	      (when disposition
-		(mime-entity-set-content-disposition-internal
-		 entity disposition)
-		disposition))))))
-
-(defun mime-entity-encoding (entity)
+	    (mime-entity-set-content-disposition-internal
+	     entity (mime-parse-Content-Disposition ret))
+	  ))))
+
+(defun mime-entity-encoding (entity &optional default-encoding)
+  "Return content-transfer-encoding of ENTITY.
+If the ENTITY does not have Content-Transfer-Encoding field, this
+function returns DEFAULT-ENCODING.  If it is nil, \"7bit\" is used as
+default value."
   (or (mime-entity-encoding-internal entity)
-      (let ((ret (mime-fetch-field 'Content-Transfer-Encoding entity)))
-	(if ret
-	    (let ((encoding (mime-parse-Content-Transfer-Encoding ret)))
-	      (when encoding
-		(mime-entity-set-encoding-internal entity encoding)
-		encoding))))))
-
-(defun mime-read-field (field-name &optional entity)
-  (or (symbolp field-name)
-      (setq field-name (capitalize (capitalize field-name))))
-  (or entity
-      (setq entity mime-message-structure))
-  (cond ((eq field-name 'Content-Type)
-	 (mime-entity-content-type entity)
-	 )
-	((eq field-name 'Content-Disposition)
-	 (mime-entity-content-disposition entity)
-	 )
-	((eq field-name 'Content-Transfer-Encoding)
-	 (mime-entity-encoding entity)
-	 )
-	(t
-	 (let* ((header (mime-entity-parsed-header-internal entity))
-		(field (cdr (assq field-name header))))
-	   (or field
-	       (let ((field-body (mime-fetch-field field-name entity)))
-		 (when field-body
-		   (cond ((memq field-name '(From Resent-From
-					     To Resent-To
-					     Cc Resent-Cc
-					     Bcc Resent-Bcc
-					     Reply-To Resent-Reply-To))
-			  (setq field (std11-parse-addresses
-				       (eword-lexical-analyze field-body)))
-			  )
-			 ((memq field-name '(Sender Resent-Sender))
-			  (setq field (std11-parse-address
-				       (eword-lexical-analyze field-body)))
-			  )
-			 ((memq field-name eword-decode-ignored-field-list)
-			  (setq field field-body))
-			 ((memq field-name eword-decode-structured-field-list)
-			  (setq field (eword-decode-structured-field-body
-				       field-body)))
-			 (t
-			  (setq field (eword-decode-unstructured-field-body
-				       field-body))
-			  ))
-		   (mime-entity-set-parsed-header-internal
-		    entity (put-alist field-name field header))
-		   field)))))))
-
-(defun eword-visible-field-p (field-name visible-fields invisible-fields)
-  (or (catch 'found
-	(while visible-fields
-	  (let ((regexp (car visible-fields)))
-	    (if (string-match regexp field-name)
-		(throw 'found t)
-	      ))
-	  (setq visible-fields (cdr visible-fields))
-	  ))
-      (catch 'found
-	(while invisible-fields
-	  (let ((regexp (car invisible-fields)))
-	    (if (string-match regexp field-name)
-		(throw 'found nil)
-	      ))
-	  (setq invisible-fields (cdr invisible-fields))
-	  )
-	t)))
-		
-(defun mime-insert-decoded-header (entity
-				   &optional invisible-fields visible-fields
-				   code-conversion)
-  "Insert before point a decoded header of ENTITY."
-  (let ((default-charset
-	  (if code-conversion
-	      (if (mime-charset-to-coding-system code-conversion)
-		  code-conversion
-		default-mime-charset))))
-    (save-restriction
-      (narrow-to-region (point)(point))
-      (let ((the-buf (current-buffer))
-	    (src-buf (mime-entity-buffer entity))
-	    (h-end (mime-entity-header-end entity))
-	    beg p end field-name len field)
-	(save-excursion
-	  (set-buffer src-buf)
-	  (goto-char (mime-entity-header-start entity))
-	  (save-restriction
-	    (narrow-to-region (point) h-end)
-	    (while (re-search-forward std11-field-head-regexp nil t)
-	      (setq beg (match-beginning 0)
-		    p (match-end 0)
-		    field-name (buffer-substring beg (1- p))
-		    len (string-width field-name)
-		    end (std11-field-end))
-	      (when (eword-visible-field-p field-name
-					   visible-fields invisible-fields)
-		(setq field (intern (capitalize field-name)))
-		(save-excursion
-		  (set-buffer the-buf)
-		  (insert field-name)
-		  (insert ":")
-		  (cond ((memq field eword-decode-ignored-field-list)
-			 ;; Don't decode
-			 (insert-buffer-substring src-buf p end)
-			 )
-			((memq field eword-decode-structured-field-list)
-			 ;; Decode as structured field
-			 (let ((body (save-excursion
-				       (set-buffer src-buf)
-				       (buffer-substring p end)))
-			       (default-mime-charset default-charset))
-			   (insert (eword-decode-and-fold-structured-field
-				    body (1+ len)))
-			   ))
-			(t
-			 ;; Decode as unstructured field
-			 (let ((body (save-excursion
-				       (set-buffer src-buf)
-				       (buffer-substring p end)))
-			       (default-mime-charset default-charset))
-			   (insert (eword-decode-unstructured-field-body
-				    body (1+ len)))
-			   )))
-		  (insert "\n")
-		  )))))))))
+      (let ((ret (mime-entity-fetch-field entity "Content-Transfer-Encoding")))
+	(mime-entity-set-encoding-internal
+	 entity
+	 (or (and ret (mime-parse-Content-Transfer-Encoding ret))
+	     default-encoding "7bit"))
+	)))
+
+(defvar mime-field-parser-alist
+  '((Return-Path	. std11-parse-route-addr)
+    
+    (Reply-To 		. std11-parse-addresses)
+    
+    (Sender		. std11-parse-mailbox)
+    (From		. std11-parse-addresses)
+
+    (Resent-Reply-To	. std11-parse-addresses)
+    
+    (Resent-Sender	. std11-parse-mailbox)
+    (Resent-From	. std11-parse-addresses)
+
+    (To			. std11-parse-addresses)
+    (Resent-To		. std11-parse-addresses)
+    (Cc			. std11-parse-addresses)
+    (Resent-Cc		. std11-parse-addresses)
+    (Bcc		. std11-parse-addresses)
+    (Resent-Bcc		. std11-parse-addresses)
+    
+    (Message-Id		. mime-parse-msg-id)
+    (Recent-Message-Id	. mime-parse-msg-id)
+    
+    (In-Reply-To	. std11-parse-msg-ids)
+    (References		. std11-parse-msg-ids)
+    
+    (Content-Id		. mime-parse-msg-id)
+    ))
+
+(defun mime-entity-read-field (entity field-name)
+  (let ((sym (if (symbolp field-name)
+		 (prog1
+		     field-name
+		   (setq field-name (symbol-name field-name)))
+	       (intern (capitalize field-name)))))
+    (cond ((eq sym 'Content-Type)
+	   (mime-entity-content-type entity)
+	   )
+	  ((eq sym 'Content-Disposition)
+	   (mime-entity-content-disposition entity)
+	   )
+	  ((eq sym 'Content-Transfer-Encoding)
+	   (mime-entity-encoding entity)
+	   )
+	  (t
+	   (let* ((header (mime-entity-parsed-header-internal entity))
+		  (field (cdr (assq sym header))))
+	     (or field
+		 (let ((field-body (mime-entity-fetch-field entity field-name))
+		       parser)
+		   (when field-body
+		     (setq parser
+			   (cdr (assq sym mime-field-parser-alist)))
+		     (setq field
+			   (if parser
+			       (funcall parser
+					(eword-lexical-analyze field-body))
+			     (mime-decode-field-body field-body sym 'plain)
+			     ))
+		     (mime-entity-set-parsed-header-internal
+		      entity (put-alist sym field header))
+		     field))))))))
+
+;; (defun mime-read-field (field-name &optional entity)
+;;   (or entity
+;;       (setq entity mime-message-structure))
+;;   (mime-entity-read-field entity field-name)
+;;   )
+;; (make-obsolete 'mime-read-field 'mime-entity-read-field)
+
+(luna-define-generic mime-insert-header (entity &optional invisible-fields
+						visible-fields)
+  "Insert before point a decoded header of ENTITY.")
 
 
 ;;; @ Entity Attributes
 ;;;
 
+(luna-define-generic mime-entity-name (entity)
+  "Return name of the ENTITY.")
+
 (defun mime-entity-uu-filename (entity)
   (if (member (mime-entity-encoding entity) mime-uuencode-encoding-name-list)
-      (save-excursion
-	(set-buffer (mime-entity-buffer entity))
-	(goto-char (mime-entity-body-start entity))
-	(if (re-search-forward "^begin [0-9]+ "
-			       (mime-entity-body-end entity) t)
+      (with-temp-buffer
+	(mime-insert-entity-body entity)
+	(if (re-search-forward "^begin [0-9]+ " nil t)
 	    (if (looking-at ".+$")
 		(buffer-substring (match-beginning 0)(match-end 0))
 	      )))))
@@ -364,57 +391,42 @@ ENTITY is used."
 (defun mime-entity-filename (entity)
   "Return filename of ENTITY."
   (or (mime-entity-uu-filename entity)
-      (mime-content-disposition-filename
-       (mime-entity-content-disposition entity))
+      (let ((ret (mime-content-disposition-filename
+		  (mime-entity-content-disposition entity))))
+	(if (and mime-header-accept-quoted-encoded-words
+		 ret)
+	    (eword-decode-string ret)
+	  ret))
       (cdr (let ((param (mime-content-type-parameters
 			 (mime-entity-content-type entity))))
 	     (or (assoc "name" param)
-		 (assoc "x-name" param))
-	     ))))
+		 (assoc "x-name" param))))))
 
 
 (defsubst mime-entity-media-type (entity)
+  "Return primary media-type of ENTITY."
   (mime-content-type-primary-type (mime-entity-content-type entity)))
+
 (defsubst mime-entity-media-subtype (entity)
+  "Return media-subtype of ENTITY."
   (mime-content-type-subtype (mime-entity-content-type entity)))
+
 (defsubst mime-entity-parameters (entity)
+  "Return parameters of Content-Type of ENTITY."
   (mime-content-type-parameters (mime-entity-content-type entity)))
+
 (defsubst mime-entity-type/subtype (entity-info)
+  "Return type/subtype of Content-Type of ENTITY."
   (mime-type/subtype-string (mime-entity-media-type entity-info)
 			    (mime-entity-media-subtype entity-info)))
 
+(defun mime-entity-set-content-type (entity content-type)
+  "Set ENTITY's content-type to CONTENT-TYPE."
+  (mime-entity-set-content-type-internal entity content-type))
 
-;;; @ Entity Content
-;;;
-
-(defun mime-entity-content (entity)
-  (mime-entity-send entity 'entity-content))
-
-(defun mime-write-entity-content (entity filename)
-  "Write content of ENTITY into FILENAME."
-  (mime-entity-send entity 'write-entity-content filename))
-
-(defun mime-write-entity (entity filename)
-  "Write ENTITY into FILENAME."
-  (save-excursion
-    (set-buffer (mime-entity-buffer entity))
-    (if (mime-entity-cooked-p entity)
-	(write-region (mime-entity-point-min entity)
-		      (mime-entity-point-max entity) filename)
-      (write-region-as-binary (mime-entity-point-min entity)
-			      (mime-entity-point-max entity) filename)
-      )))
-
-(defun mime-write-entity-body (entity filename)
-  "Write body of ENTITY into FILENAME."
-  (save-excursion
-    (set-buffer (mime-entity-buffer entity))
-    (if (mime-entity-cooked-p entity)
-	(write-region (mime-entity-body-start entity)
-		      (mime-entity-body-end entity) filename)
-      (write-region-as-binary (mime-entity-body-start entity)
-			      (mime-entity-body-end entity) filename)
-      )))
+(defun mime-entity-set-encoding (entity encoding)
+  "Set ENTITY's content-transfer-encoding to ENCODING."
+  (mime-entity-set-encoding-internal entity encoding))
 
 
 ;;; @ end