X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=fa20a85c5f83eac36d043d2a9391675f7cc2cc01;hb=5fb11b58b6a6c8ebabf0cee2c30b92293b056a23;hp=0f004b3a274891fc917bddbe3e7d96bc9d8c0b4d;hpb=296f230f41ff633b4431f160170f8ddc15327afc;p=elisp%2Fflim.git

diff --git a/mime-parse.el b/mime-parse.el
index 0f004b3..fa20a85 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -58,12 +58,7 @@
 ;;; @ Content-Type
 ;;;
 
-(defsubst make-mime-content-type (type subtype &optional parameters)
-  (list* (cons 'type type)
-	 (cons 'subtype subtype)
-	 (nreverse parameters))
-  )
-
+;;;###autoload
 (defun mime-parse-Content-Type (string)
   "Parse STRING as field-body of Content-Type field.
 Return value is
@@ -87,6 +82,7 @@ are string."
 				(nreverse dest))
 	)))
 
+;;;###autoload
 (defun mime-read-Content-Type ()
   "Read field-body of Content-Type field from current-buffer,
 and return parsed it.  Format of return value is as same as
@@ -96,28 +92,13 @@ and return parsed it.  Format of return value is as same as
 	(mime-parse-Content-Type str)
       )))
 
-(defsubst mime-content-type-primary-type (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cdr (car content-type)))
-
-(defsubst mime-content-type-subtype (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cdr (cadr content-type)))
-
-(defsubst mime-content-type-parameters (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cddr content-type))
-
-(defsubst mime-content-type-parameter (content-type parameter)
-  "Return PARAMETER value of CONTENT-TYPE."
-  (cdr (assoc parameter (mime-content-type-parameters content-type))))
-
 
 ;;; @ Content-Disposition
 ;;;
 
 (defconst mime-disposition-type-regexp mime-token-regexp)
 
+;;;###autoload
 (defun mime-parse-Content-Disposition (string)
   "Parse STRING as field-body of Content-Disposition field."
   (setq string (std11-unfold-string string))
@@ -134,6 +115,7 @@ and return parsed it.  Format of return value is as same as
 	      (nreverse dest))
 	)))
 
+;;;###autoload
 (defun mime-read-Content-Disposition ()
   "Read field-body of Content-Disposition field from current-buffer,
 and return parsed it."
@@ -142,26 +124,11 @@ and return parsed it."
 	(mime-parse-Content-Disposition str)
       )))
 
-(defsubst mime-content-disposition-type (content-disposition)
-  "Return disposition-type of CONTENT-DISPOSITION."
-  (cdr (car content-disposition)))
-
-(defsubst mime-content-disposition-parameters (content-disposition)
-  "Return disposition-parameters of CONTENT-DISPOSITION."
-  (cdr content-disposition))
-
-(defsubst mime-content-disposition-parameter (content-disposition parameter)
-  "Return PARAMETER value of CONTENT-DISPOSITION."
-  (cdr (assoc parameter (cdr content-disposition))))
-
-(defsubst mime-content-disposition-filename (content-disposition)
-  "Return filename of CONTENT-DISPOSITION."
-  (mime-content-disposition-parameter content-disposition "filename"))
-
 
 ;;; @ Content-Transfer-Encoding
 ;;;
 
+;;;###autoload
 (defun mime-parse-Content-Transfer-Encoding (string)
   "Parse STRING as field-body of Content-Transfer-Encoding field."
   (if (string-match "[ \t\n\r]+$" string)
@@ -169,6 +136,7 @@ and return parsed it."
     )
   (downcase string))
 
+;;;###autoload
 (defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
   "Read field-body of Content-Transfer-Encoding field from
 current-buffer, and return it.
@@ -182,28 +150,13 @@ If is is not found, return DEFAULT-ENCODING."
 ;;; @ message parser
 ;;;
 
-(defalias 'mime-entity-point-min 'mime-entity-header-start)
-(defalias 'mime-entity-point-max 'mime-entity-body-end)
-
-(defsubst mime-entity-media-type (entity)
-  (mime-content-type-primary-type (mime-entity-content-type entity)))
-(defsubst mime-entity-media-subtype (entity)
-  (mime-content-type-subtype (mime-entity-content-type entity)))
-(defsubst mime-entity-parameters (entity)
-  (mime-content-type-parameters (mime-entity-content-type entity)))
-
-(defsubst mime-entity-type/subtype (entity-info)
-  (mime-type/subtype-string (mime-entity-media-type entity-info)
-			    (mime-entity-media-subtype entity-info)))
-
-(defun mime-parse-multipart (header-start header-end body-start body-end
-					  content-type content-disposition
-					  encoding node-id)
+(defun mime-parse-multipart (entity)
   (goto-char (point-min))
-  (let* ((dash-boundary
-	  (concat "--"
-		  (std11-strip-quoted-string
-		   (mime-content-type-parameter content-type "boundary"))))
+  (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)))
 	 (close-delimiter (concat delimiter "--[ \t]*$"))
 	 (rsep (concat delimiter "[ \t]*\n"))
@@ -212,7 +165,8 @@ If is is not found, return DEFAULT-ENCODING."
 	      (make-mime-content-type 'message 'rfc822)
 	    (make-mime-content-type 'text 'plain)
 	    ))
-	 cb ce ret ncb children (i 0))
+	 (header-end (mime-entity-header-end-internal entity))
+	 (body-end (mime-entity-body-end-internal entity)))
     (save-restriction
       (goto-char body-end)
       (narrow-to-region header-end
@@ -220,140 +174,94 @@ 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 "7bit" (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 "7bit" (cons i node-id)))
-	)
-      (setq children (cons ret children))
-      )
-    (make-mime-entity (current-buffer)
-		      header-start header-end body-start body-end
-		      node-id content-type content-disposition encoding
-		      (nreverse children))
-    ))
+      (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-message (&optional default-ctl default-encoding 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-encapsulated (entity)
+  (mime-entity-set-children-internal
+   entity
+   (save-restriction
+     (narrow-to-region (mime-entity-body-start-internal entity)
+		       (mime-entity-body-end-internal entity))
+     (list (mime-parse-message
+	    (mime-entity-representation-type-internal entity) nil
+	    entity (cons 0 (mime-entity-node-id-internal entity))))
+     )))
+
+(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 content-disposition encoding
-	primary-type)
+	content-type)
     (goto-char header-start)
     (if (re-search-forward "^$" nil t)
 	(setq header-end (match-end 0)
-	      body-start (1+ header-end))
+	      body-start (if (= header-end body-end)
+			     body-end
+			   (1+ header-end)))
       (setq header-end (point-min)
-	    body-start (point-min))
-      )
+	    body-start (point-min)))
     (save-restriction
       (narrow-to-region header-start header-end)
       (setq content-type (or (let ((str (std11-fetch-field "Content-Type")))
 			       (if str
 				   (mime-parse-Content-Type str)
 				 ))
-			     default-ctl)
-	    content-disposition (let ((str (std11-fetch-field
-					    "Content-Disposition")))
-				  (if str
-				      (mime-parse-Content-Disposition str)
-				    ))
-	    encoding (let ((str (std11-fetch-field
-				 "Content-Transfer-Encoding")))
-		       (if str
-			   (mime-parse-Content-Transfer-Encoding str)
-			 default-encoding))
-	    primary-type (mime-content-type-primary-type content-type))
+			     default-ctl))
       )
-    (cond ((eq primary-type 'multipart)
-	   (mime-parse-multipart header-start header-end
-				 body-start body-end
-				 content-type content-disposition encoding
-				 node-id)
-	   )
-	  ((and (eq primary-type 'message)
-		(memq (mime-content-type-subtype content-type)
-		      '(rfc822 news external-body)
-		      ))
-           (make-mime-entity (current-buffer)
-			     header-start header-end body-start body-end
-			     node-id
-			     content-type content-disposition encoding
-			     (save-restriction
-			       (narrow-to-region body-start body-end)
-			       (list (mime-parse-message
-				      nil nil (cons 0 node-id)))
-			       ))
-	   )
-	  (t 
-           (make-mime-entity (current-buffer)
-			     header-start header-end body-start body-end
-			     node-id
-			     content-type content-disposition encoding nil)
-	   ))
+    (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
 ;;;
 
-(defvar mime-message-structure nil
-  "Information about structure of message.
-Please use reference function `mime-entity-SLOT' to get value of SLOT.
-
-Following is a list of slots of the structure:
-
-buffer			buffer includes this entity (buffer).
-node-id			node-id (list of integers)
-header-start		minimum point of header in raw-buffer
-header-end		maximum point of header in raw-buffer
-body-start		minimum point of body in raw-buffer
-body-end		maximum point of body in raw-buffer
-content-type		content-type (content-type)
-content-disposition	content-disposition (content-disposition)
-encoding		Content-Transfer-Encoding (string or nil)
-children		entities included in this entity (list of entity)
-
-If an entity includes other entities in its body, such as multipart or
-message/rfc822, `mime-entity' structures of them are included in
-`children', so the `mime-entity' structure become a tree.")
-(make-variable-buffer-local 'mime-message-structure)
-
-(defun mime-parse-buffer (&optional buffer)
+;;;###autoload
+(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))
     ))
 
 
-;;; @ utilities
-;;;
-
-(defsubst mime-root-entity-p (entity)
-  "Return t if ENTITY is root-entity (message)."
-  (null (mime-entity-node-id entity)))
-
-
 ;;; @ end
 ;;;