X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=15a7a36db7cf7074dc1454db39a89165b38f5cda;hb=a0b108d58d36fff037f8d27eb9a2a91a7d518b9c;hp=060cbce3445634e3bda8cd1e97fefffa61bff269;hpb=efbc608230946e368fc82ca0d3e80d81cf2ce0ee;p=elisp%2Fflim.git

diff --git a/mime-parse.el b/mime-parse.el
index 060cbce..15a7a36 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -24,10 +24,12 @@
 
 ;;; Code:
 
-(require 'std11)
 (require 'mime-def)
+(require 'std11)
 
-(eval-when-compile (require 'cl))
+(autoload 'mime-entity-body-buffer "mime")
+(autoload 'mime-entity-body-start-point "mime")
+(autoload 'mime-entity-body-end-point "mime")
 
 
 ;;; @ lexical analyzer
@@ -103,8 +105,9 @@ Return value is
 or nil.  PRIMARY-TYPE and SUBTYPE are symbol and NAME_n and VALUE_n
 are string."
   (setq string (std11-unfold-string string))
-  (if (string-match `,(concat "^\\(" mime-token-regexp
-			      "\\)/\\(" mime-token-regexp "\\)") string)
+  (if (string-match (eval-when-compile
+		      (concat "^\\(" mime-token-regexp
+			      "\\)/\\(" mime-token-regexp "\\)")) string)
       (let* ((type (downcase
 		    (substring string (match-beginning 1) (match-end 1))))
 	     (subtype (downcase
@@ -211,6 +214,129 @@ If is is not found, return DEFAULT-ENCODING."
 			      '((specials . ">")))))))
 
 
+;;; @ message parser
+;;;
+
+(defun mime-parse-multipart (entity)
+  (with-current-buffer (mime-entity-body-buffer 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)))
+	   (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-entity-body-start-point entity))
+	   (body-end (mime-entity-body-end-point 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 mime-parse-encapsulated (entity)
+  (mime-entity-set-children-internal
+   entity
+   (with-current-buffer (mime-entity-body-buffer entity)
+     (save-restriction
+       (narrow-to-region (mime-entity-body-start-point entity)
+			 (mime-entity-body-end-point 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)
+    (goto-char header-start)
+    (if (re-search-forward "^$" nil t)
+	(setq header-end (match-end 0)
+	      body-start (if (= header-end body-end)
+			     body-end
+			   (1+ header-end)))
+      (setq header-end (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))
+      )
+    (luna-make-entity representation-type
+		      :location (current-buffer)
+		      :content-type content-type
+		      :parent parent
+		      :node-id node-id
+		      :buffer (current-buffer)
+		      :header-start header-start
+		      :header-end header-end
+		      :body-start body-start
+		      :body-end body-end)
+    ))
+
+
+;;; @ for 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 (or representation-type
+				  'mime-buffer-entity) nil))
+    ))
+
 
 ;;; @ end
 ;;;