X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mmbuffer.el;h=c605a59726f7727749ecf98e3a2be35fa25ff786;hb=refs%2Fheads%2Flimit-1_14;hp=f014aeccd024c8d85743c49f05ea26e182af437c;hpb=09986cc02a99ec95288aef3f2e890426ae252b54;p=elisp%2Fflim.git

diff --git a/mmbuffer.el b/mmbuffer.el
index f014aec..c605a59 100644
--- a/mmbuffer.el
+++ b/mmbuffer.el
@@ -1,8 +1,6 @@
 ;;; mmbuffer.el --- MIME entity module for binary buffer
 
-;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1998,1999,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: MIME, multimedia, mail, news
@@ -21,11 +19,12 @@
 
 ;; 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:
 
+(require 'mmgeneric)
 (require 'mime)
 
 (eval-and-compile
@@ -43,11 +42,9 @@
 						&rest init-args)
   (or (mime-buffer-entity-buffer-internal entity)
       (mime-buffer-entity-set-buffer-internal
-       entity (mime-entity-location-internal entity)))
+       entity (get-buffer (mime-entity-location-internal entity))))
   (save-excursion
     (set-buffer (mime-buffer-entity-buffer-internal entity))
-    (if (mime-root-entity-p entity)
-	(setq mime-message-structure entity))
     (let ((header-start
 	   (or (mime-buffer-entity-header-start-internal entity)
 	       (mime-buffer-entity-set-header-start-internal
@@ -87,69 +84,56 @@
   )
 
 
-(defun mime-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-header-from-buffer (buffer start end
-					      &optional invisible-fields
-					      visible-fields)
-  (let ((the-buf (current-buffer))
-	(mode-obj (mime-find-field-presentation-method 'wide))
-	field-decoder
-	f-b p f-e field-name len field field-body)
-    (save-excursion
-      (set-buffer buffer)
-      (save-restriction
-	(narrow-to-region start end)
-	(goto-char start)
-	(while (re-search-forward std11-field-head-regexp nil t)
-	  (setq f-b (match-beginning 0)
-		p (match-end 0)
-		field-name (buffer-substring f-b p)
-		len (string-width field-name)
-		f-e (std11-field-end))
-	  (when (mime-visible-field-p field-name
-				      visible-fields invisible-fields)
-	    (setq field (intern
-			 (capitalize (buffer-substring f-b (1- p))))
-		  field-body (buffer-substring p f-e)
-		  field-decoder (inline (mime-find-field-decoder-internal
-					 field mode-obj)))
-	    (with-current-buffer the-buf
-	      (insert field-name)
-	      (insert (if field-decoder
-			  (funcall field-decoder field-body len)
-			;; Don't decode
-			field-body))
-	      (insert "\n")
-	      )))))))
+;;; @ entity
+;;;
 
-(luna-define-method mime-insert-header ((entity mime-buffer-entity)
-					&optional invisible-fields
-					visible-fields)
-  (mime-insert-header-from-buffer
-   (mime-buffer-entity-buffer-internal entity)
-   (mime-buffer-entity-header-start-internal entity)
-   (mime-buffer-entity-header-end-internal entity)
-   invisible-fields visible-fields)
+(luna-define-method mime-insert-entity ((entity mime-buffer-entity))
+  (insert-buffer-substring (mime-buffer-entity-buffer-internal entity)
+			   (mime-buffer-entity-header-start-internal entity)
+			   (mime-buffer-entity-body-end-internal entity))
+  )
+
+(luna-define-method mime-write-entity ((entity mime-buffer-entity) filename)
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region (mime-buffer-entity-header-start-internal entity)
+		    (mime-buffer-entity-body-end-internal entity)
+		    filename))))
+
+
+;;; @ entity header
+;;;
+
+
+;;; @ entity body
+;;;
+
+(luna-define-method mime-entity-body ((entity mime-buffer-entity))
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (buffer-substring (mime-buffer-entity-body-start-internal entity)
+		      (mime-buffer-entity-body-end-internal entity))))
+
+(luna-define-method mime-insert-entity-body ((entity mime-buffer-entity))
+  (insert-buffer-substring (mime-buffer-entity-buffer-internal entity)
+			   (mime-buffer-entity-body-start-internal entity)
+			   (mime-buffer-entity-body-end-internal entity))
   )
 
+(luna-define-method mime-write-entity-body ((entity mime-buffer-entity)
+					    filename)
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (binary-write-decoded-region
+     (mime-buffer-entity-body-start-internal entity)
+     (mime-buffer-entity-body-end-internal entity)
+     filename)))
+
+
+;;; @ entity content
+;;;
+
 (luna-define-method mime-entity-content ((entity mime-buffer-entity))
   (save-excursion
     (set-buffer (mime-buffer-entity-buffer-internal entity))
@@ -158,6 +142,27 @@
 		       (mime-buffer-entity-body-end-internal entity))
      (mime-entity-encoding entity))))
 
+(luna-define-method mime-insert-entity-content ((entity mime-buffer-entity))
+  (insert (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+	    (mime-decode-string
+	     (buffer-substring (mime-buffer-entity-body-start-internal entity)
+			       (mime-buffer-entity-body-end-internal entity))
+	     (mime-entity-encoding entity)))))
+
+(luna-define-method mime-write-entity-content ((entity mime-buffer-entity)
+					       filename)
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (mime-write-decoded-region (mime-buffer-entity-body-start-internal entity)
+			       (mime-buffer-entity-body-end-internal entity)
+			       filename
+			       (or (mime-entity-encoding entity) "7bit"))
+    ))
+
+
+;;; @ header field
+;;;
+
 (luna-define-method mime-entity-fetch-field :around
   ((entity mime-buffer-entity) field-name)
   (or (luna-call-next-method)
@@ -169,117 +174,181 @@
 	  (let ((ret (std11-fetch-field field-name)))
 	    (when ret
 	      (or (symbolp field-name)
-		  (setq field-name
-			(intern (capitalize (capitalize field-name)))))
+		  (setq field-name (intern (capitalize field-name))))
   	      (mime-entity-set-original-header-internal
 	       entity
 	       (put-alist field-name ret
 			  (mime-entity-original-header-internal entity)))
 	      ret))))))
 
-(mm-define-method insert-entity-content ((entity buffer))
-  (insert (with-current-buffer (mime-buffer-entity-buffer-internal entity)
-	    (mime-decode-string
-	     (buffer-substring (mime-buffer-entity-body-start-internal entity)
-			       (mime-buffer-entity-body-end-internal entity))
-	     (mime-entity-encoding entity)))))
-
-(mm-define-method write-entity-content ((entity buffer) filename)
-  (save-excursion
-    (set-buffer (mime-buffer-entity-buffer-internal entity))
-    (mime-write-decoded-region (mime-buffer-entity-body-start-internal entity)
-			       (mime-buffer-entity-body-end-internal entity)
-			       filename
-			       (or (mime-entity-encoding entity) "7bit"))
-    ))
-
-(mm-define-method insert-entity ((entity buffer))
-  (insert-buffer-substring (mime-buffer-entity-buffer-internal entity)
-			   (mime-buffer-entity-header-start-internal entity)
-			   (mime-buffer-entity-body-end-internal entity))
+(luna-define-method mime-insert-header ((entity mime-buffer-entity)
+					&optional invisible-fields
+					visible-fields)
+  (mime-insert-header-from-buffer
+   (mime-buffer-entity-buffer-internal entity)
+   (mime-buffer-entity-header-start-internal entity)
+   (mime-buffer-entity-header-end-internal entity)
+   invisible-fields visible-fields)
   )
 
-(mm-define-method write-entity ((entity buffer) filename)
-  (save-excursion
-    (set-buffer (mime-buffer-entity-buffer-internal entity))
-    (write-region-as-raw-text-CRLF
-     (mime-buffer-entity-header-start-internal entity)
-     (mime-buffer-entity-body-end-internal entity)
-     filename)
-    ))
-
-(mm-define-method write-entity-body ((entity buffer) filename)
-  (save-excursion
-    (set-buffer (mime-buffer-entity-buffer-internal entity))
-    (write-region-as-binary (mime-buffer-entity-body-start-internal entity)
-			    (mime-buffer-entity-body-end-internal entity)
-			    filename)
-    ))
-
 
 ;;; @ header buffer
 ;;;
 
-(luna-define-method mime-entity-header-buffer ((entity mime-buffer-entity))
-  (mime-buffer-entity-buffer-internal entity)
-  )
+;; (luna-define-method mime-entity-header-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
 
-(luna-define-method mime-goto-header-start-point ((entity mime-buffer-entity))
-  (set-buffer (mime-buffer-entity-buffer-internal entity))
-  (goto-char (mime-buffer-entity-header-start-internal entity))
-  )
+;; (luna-define-method mime-goto-header-start-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-header-start-internal entity))
+;;   )
 
-(luna-define-method mime-entity-header-start-point ((entity
-						     mime-buffer-entity))
-  (mime-buffer-entity-header-start-internal entity)
-  )
+;; (luna-define-method mime-entity-header-start-point ((entity
+;;                                                      mime-buffer-entity))
+;;   (mime-buffer-entity-header-start-internal entity)
+;;   )
 
-(luna-define-method mime-entity-header-end-point ((entity
-						   mime-buffer-entity))
-  (mime-buffer-entity-header-end-internal entity)
-  )
+;; (luna-define-method mime-entity-header-end-point ((entity
+;;                                                    mime-buffer-entity))
+;;   (mime-buffer-entity-header-end-internal entity)
+;;   )
 
 
 ;;; @ body buffer
 ;;;
 
-(luna-define-method mime-entity-body-buffer ((entity mime-buffer-entity))
-  (mime-buffer-entity-buffer-internal entity)
-  )
+;; (luna-define-method mime-entity-body-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
 
-(luna-define-method mime-goto-body-start-point ((entity mime-buffer-entity))
-  (set-buffer (mime-buffer-entity-buffer-internal entity))
-  (goto-char (mime-buffer-entity-body-start-internal entity))
-  )
+;; (luna-define-method mime-goto-body-start-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-body-start-internal entity))
+;;   )
 
-(luna-define-method mime-goto-body-end-point ((entity mime-buffer-entity))
-  (set-buffer (mime-buffer-entity-buffer-internal entity))
-  (goto-char (mime-buffer-entity-body-end-internal entity))
-  )
+;; (luna-define-method mime-goto-body-end-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-body-end-internal entity))
+;;   )
 
-(luna-define-method mime-entity-body-start-point ((entity mime-buffer-entity))
-  (mime-buffer-entity-body-start-internal entity)
-  )
+;; (luna-define-method mime-entity-body-start-point ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-start-internal entity)
+;;   )
 
-(luna-define-method mime-entity-body-end-point ((entity mime-buffer-entity))
-  (mime-buffer-entity-body-end-internal entity)
-  )
+;; (luna-define-method mime-entity-body-end-point ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-end-internal entity)
+;;   )
 
 
 ;;; @ buffer (obsolete)
 ;;;
 
-(luna-define-method mime-entity-buffer ((entity mime-buffer-entity))
-  (mime-buffer-entity-buffer-internal entity)
-  )
+;; (luna-define-method mime-entity-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
 
-(luna-define-method mime-entity-point-min ((entity mime-buffer-entity))
-  (mime-buffer-entity-header-start-internal entity)
-  )
+;; (luna-define-method mime-entity-point-min ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-header-start-internal entity)
+;;   )
 
-(luna-define-method mime-entity-point-max ((entity mime-buffer-entity))
-  (mime-buffer-entity-body-end-internal entity)
-  )
+;; (luna-define-method mime-entity-point-max ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-end-internal entity)
+;;   )
+
+
+;;; @ children
+;;;
+
+(defun mmbuffer-parse-multipart (entity &optional representation-type)
+  (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+    (or representation-type
+	(setq representation-type
+	      (mime-entity-representation-type-internal entity)))
+    (let* ((content-type (mime-entity-content-type-internal entity))
+	   (dash-boundary
+	    (concat "--"
+		    (mime-content-type-parameter content-type "boundary")))
+	   (delimiter       (concat "\n" (regexp-quote dash-boundary)))
+	   (close-delimiter (concat delimiter "--[ \t]*$"))
+	   (rsep (concat delimiter "[ \t]*\n"))
+	   (dc-ctl
+	    (if (eq (mime-content-type-subtype content-type) 'digest)
+		(make-mime-content-type 'message 'rfc822)
+	      (make-mime-content-type 'text 'plain)
+	      ))
+	   (body-start (mime-buffer-entity-body-start-internal entity))
+	   (body-end (mime-buffer-entity-body-end-internal entity)))
+      (save-restriction
+	(goto-char body-end)
+	(narrow-to-region body-start
+			  (if (re-search-backward close-delimiter nil t)
+			      (match-beginning 0)
+			    body-end))
+	(goto-char body-start)
+	(if (re-search-forward
+	     (concat "^" (regexp-quote dash-boundary) "[ \t]*\n")
+	     nil t)
+	    (let ((cb (match-end 0))
+		  ce ncb ret children
+		  (node-id (mime-entity-node-id-internal entity))
+		  (i 0))
+	      (while (re-search-forward rsep nil t)
+		(setq ce (match-beginning 0))
+		(setq ncb (match-end 0))
+		(save-restriction
+		  (narrow-to-region cb ce)
+		  (setq ret (mime-parse-message representation-type dc-ctl
+						entity (cons i node-id)))
+		  )
+		(setq children (cons ret children))
+		(goto-char (setq cb ncb))
+		(setq i (1+ i))
+		)
+	      (setq ce (point-max))
+	      (save-restriction
+		(narrow-to-region cb ce)
+		(setq ret (mime-parse-message representation-type dc-ctl
+					      entity (cons i node-id)))
+		)
+	      (setq children (cons ret children))
+	      (mime-entity-set-children-internal entity (nreverse children))
+	      )
+	  (mime-entity-set-content-type-internal
+	   entity (make-mime-content-type 'message 'x-broken))
+	  nil)
+	))))
+
+(defun mmbuffer-parse-encapsulated (entity &optional external
+					   representation-type)
+  (mime-entity-set-children-internal
+   entity
+   (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+     (save-restriction
+       (narrow-to-region (mime-buffer-entity-body-start-internal entity)
+			 (mime-buffer-entity-body-end-internal entity))
+       (list (mime-parse-message
+	      (if external
+		  (progn
+		    (require 'mmexternal)
+		    'mime-external-entity)
+		(or representation-type
+		    (mime-entity-representation-type-internal entity)))
+	      nil
+	      entity (cons 0 (mime-entity-node-id-internal entity))))))))
+
+(luna-define-method mime-entity-children ((entity mime-buffer-entity))
+  (let* ((content-type (mime-entity-content-type entity))
+	 (primary-type (mime-content-type-primary-type content-type))
+	 sub-type)
+    (cond ((eq primary-type 'multipart)
+	   (mmbuffer-parse-multipart entity))
+	  ((eq primary-type 'message)
+	   (setq sub-type (mime-content-type-subtype content-type))
+	   (cond ((eq sub-type 'external-body)
+		  (mmbuffer-parse-encapsulated entity 'external))
+		 ((memq sub-type '(rfc822 news))
+		  (mmbuffer-parse-encapsulated entity)))))))
 
 
 ;;; @ end