X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=5442896683182267bc68435b5f637983c57fe7f0;hb=3289614859eb6669c1060077286b2842dd58315c;hp=fa20a85c5f83eac36d043d2a9391675f7cc2cc01;hpb=7d591c9ac2ebd788b1c667e0f5dadf46f6f9d47f;p=elisp%2Fflim.git

diff --git a/mime-parse.el b/mime-parse.el
index fa20a85..5442896 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -1,6 +1,6 @@
 ;;; mime-parse.el --- MIME message parser
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: parse, MIME, multimedia, mail, news
@@ -24,11 +24,50 @@
 
 ;;; Code:
 
-(require 'emu)
-(require 'std11)
 (require 'mime-def)
+(require 'std11)
+
+(autoload 'mime-entity-body-buffer "mime")
+(autoload 'mime-entity-body-start-point "mime")
+(autoload 'mime-entity-body-end-point "mime")
+
+
+;;; @ lexical analyzer
+;;;
 
-(eval-when-compile (require 'cl))
+(defcustom mime-lexical-analyzer
+  '(std11-analyze-quoted-string
+    std11-analyze-domain-literal
+    std11-analyze-comment
+    std11-analyze-spaces
+    mime-analyze-tspecial
+    mime-analyze-token)
+  "*List of functions to return result of lexical analyze.
+Each function must have two arguments: STRING and START.
+STRING is the target string to be analyzed.
+START is start position of STRING to analyze.
+
+Previous function is preferred to next function.  If a function
+returns nil, next function is used.  Otherwise the return value will
+be the result."
+  :group 'mime
+  :type '(repeat function))
+
+(defun mime-analyze-tspecial (string start)
+  (if (and (> (length string) start)
+	   (memq (aref string start) mime-tspecial-char-list))
+      (cons (cons 'tpecials (substring string start (1+ start)))
+	    (1+ start))
+    ))
+
+(defun mime-analyze-token (string start)
+  (if (and (string-match mime-token-regexp string start)
+	   (= (match-beginning 0) start))
+      (let ((end (match-end 0)))
+	(cons (cons 'mime-token (substring string start end))
+	      ;;(substring string end)
+	      end)
+	)))
 
 
 ;;; @ field parser
@@ -96,13 +135,16 @@ and return parsed it.  Format of return value is as same as
 ;;; @ Content-Disposition
 ;;;
 
-(defconst mime-disposition-type-regexp mime-token-regexp)
+(eval-and-compile
+  (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))
-  (if (string-match `,(concat "^" mime-disposition-type-regexp) string)
+  (if (string-match (eval-when-compile
+		      (concat "^" mime-disposition-type-regexp)) string)
       (let* ((e (match-end 0))
 	     (type (downcase (substring string 0 e)))
 	     ret dest)
@@ -131,10 +173,16 @@ and return parsed it."
 ;;;###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)
-      (setq string (match-string 0 string))
-    )
-  (downcase string))
+  (let ((tokens (std11-lexical-analyze string mime-lexical-analyzer))
+	token)
+    (while (and tokens
+		(setq token (car tokens))
+		(std11-ignored-token-p token))
+      (setq tokens (cdr tokens)))
+    (if token
+	(if (eq (car token) 'mime-token)
+	    (downcase (cdr token))
+	  ))))
 
 ;;;###autoload
 (defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
@@ -147,74 +195,96 @@ If is is not found, return DEFAULT-ENCODING."
       default-encoding)))
 
 
+;;; @ Content-Id / Message-Id
+;;;
+
+;;;###autoload
+(defun mime-parse-msg-id (tokens)
+  "Parse TOKENS as msg-id of Content-Id or Message-Id field."
+  (car (std11-parse-msg-id tokens)))
+
+;;;###autoload
+(defun mime-uri-parse-cid (string)
+  "Parse STRING as cid URI."
+  (inline
+    (mime-parse-msg-id (cons '(specials . "<")
+			     (nconc
+			      (cdr (cdr (std11-lexical-analyze string)))
+			      '((specials . ">")))))))
+
+
 ;;; @ message parser
 ;;;
 
 (defun mime-parse-multipart (entity)
-  (goto-char (point-min))
-  (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)
-	    ))
-	 (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
-			(if (re-search-backward close-delimiter nil t)
-			    (match-beginning 0)
-			  body-end))
-      (goto-char header-end)
-      (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))
+  (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))
-	      (goto-char (setq cb ncb))
-	      (setq i (1+ i))
+	      (mime-entity-set-children-internal entity (nreverse children))
 	      )
-	    (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)
-      )))
+	  (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
-   (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))))
-     )))
+   (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)
@@ -239,12 +309,16 @@ If is is not found, return DEFAULT-ENCODING."
 				 ))
 			     default-ctl))
       )
-    (make-mime-entity-internal representation-type
-			       (current-buffer)
-			       content-type nil parent node-id
-			       (current-buffer)
-			       header-start header-end
-			       body-start body-end)
+    (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)
     ))
 
 
@@ -258,7 +332,8 @@ 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 'buffer) nil))
+	  (mime-parse-message (or representation-type
+				  'mime-buffer-entity) nil))
     ))