X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=fa20a85c5f83eac36d043d2a9391675f7cc2cc01;hb=6769bf5954ca2bf221dfa9a41e2d47b24a135d79;hp=3201a9f4c08732433ec9d9b3f43ccec5b4164723;hpb=27f39dbb4a2c3dd01e0ee97f62217c0f972a4d93;p=elisp%2Fflim.git

diff --git a/mime-parse.el b/mime-parse.el
index 3201a9f..fa20a85 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -152,7 +152,9 @@ If is is not found, return DEFAULT-ENCODING."
 
 (defun mime-parse-multipart (entity)
   (goto-char (point-min))
-  (let* ((content-type (mime-entity-content-type-internal entity))
+  (let* ((representation-type
+	  (mime-entity-representation-type-internal entity))
+	 (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)))
@@ -164,9 +166,7 @@ If is is not found, return DEFAULT-ENCODING."
 	    (make-mime-content-type 'text 'plain)
 	    ))
 	 (header-end (mime-entity-header-end-internal entity))
-	 (body-end (mime-entity-body-end-internal entity))
-	 (node-id (mime-entity-node-id-internal entity))
-	 cb ce ret ncb children (i 0))
+	 (body-end (mime-entity-body-end-internal entity)))
     (save-restriction
       (goto-char body-end)
       (narrow-to-region header-end
@@ -174,28 +174,36 @@ If is is not found, return DEFAULT-ENCODING."
 			    (match-beginning 0)
 			  body-end))
       (goto-char header-end)
-      (re-search-forward rsep nil t)
-      (setq cb (match-end 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 dc-ctl (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 dc-ctl (cons i node-id)))
-	)
-      (setq children (cons ret children))
-      )
-    (mime-entity-set-children-internal entity (nreverse children))
-    entity))
+      (if (re-search-forward rsep 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 mime-parse-encapsulated (entity)
   (mime-entity-set-children-internal
@@ -204,21 +212,17 @@ If is is not found, return DEFAULT-ENCODING."
      (narrow-to-region (mime-entity-body-start-internal entity)
 		       (mime-entity-body-end-internal entity))
      (list (mime-parse-message
-	    nil (cons 0 (mime-entity-node-id-internal entity))))
-     ))
-  entity)
+	    (mime-entity-representation-type-internal entity) nil
+	    entity (cons 0 (mime-entity-node-id-internal entity))))
+     )))
 
-;;;###autoload
-(defun mime-parse-message (&optional default-ctl node-id)
-  "Parse current-buffer as a MIME message.
-DEFAULT-CTL is used when an entity does not have valid Content-Type
-field.  Its format must be as same as return value of
-mime-{parse|read}-Content-Type."
+(defun mime-parse-message (representation-type &optional default-ctl 
+					       parent node-id)
   (let ((header-start (point-min))
 	header-end
 	body-start
 	(body-end (point-max))
-	content-type primary-type entity)
+	content-type)
     (goto-char header-start)
     (if (re-search-forward "^$" nil t)
 	(setq header-end (match-end 0)
@@ -233,35 +237,28 @@ mime-{parse|read}-Content-Type."
 			       (if str
 				   (mime-parse-Content-Type str)
 				 ))
-			     default-ctl)
-	    primary-type (mime-content-type-primary-type content-type))
+			     default-ctl))
       )
-    (setq entity
-	  (make-mime-entity-internal
-	   (current-buffer) header-start header-end body-start body-end
-	   node-id content-type))
-    (cond ((eq primary-type 'multipart)
-	   (mime-parse-multipart entity)
-	   )
-	  ((and (eq primary-type 'message)
-		(memq (mime-content-type-subtype content-type)
-		      '(rfc822 news external-body)
-		      ))
-	   (mime-parse-encapsulated entity)
-	   )
-	  (t entity))))
+    (make-mime-entity-internal representation-type
+			       (current-buffer)
+			       content-type nil parent node-id
+			       (current-buffer)
+			       header-start header-end
+			       body-start body-end)
+    ))
 
 
 ;;; @ for buffer
 ;;;
 
 ;;;###autoload
-(defun mime-parse-buffer (&optional buffer)
+(defun mime-parse-buffer (&optional buffer representation-type)
   "Parse BUFFER as a MIME message.
 If buffer is omitted, it parses current-buffer."
   (save-excursion
     (if buffer (set-buffer buffer))
-    (setq mime-message-structure (mime-parse-message))
+    (setq mime-message-structure
+	  (mime-parse-message (or representation-type 'buffer) nil))
     ))