X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=7f9e4dae78c250438f56b0e61eab93009a5e141c;hb=9fe7cf94b373e21d85ae49b7267784444ed5a8f0;hp=bd51c746fc48e4d03fc6326fe072353df344554d;hpb=c35bbab73be31389cfaee57ce38f9add7295da29;p=elisp%2Fsemi.git

diff --git a/mime-parse.el b/mime-parse.el
index bd51c74..7f9e4da 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -1,12 +1,11 @@
 ;;; mime-parse.el --- MIME message parser
 
-;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: mime-parse.el,v 0.17 1997-09-05 06:43:14 morioka Exp $
 ;; Keywords: parse, MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Spadework for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -29,66 +28,13 @@
 (require 'std11)
 (require 'mime-def)
 
-(defsubst symbol-concat (&rest args)
-  "Return a symbol whose name is concatenation of arguments ARGS
-which are string or symbol."
-  (intern (mapconcat (function
-		      (lambda (s)
-			(cond ((symbolp s) (symbol-name s))
-			      ((stringp s) s)
-			      )))
-		     args "")))
-
-(defmacro define-structure (name &rest slots)
-  (let ((pred (symbol-concat name '-p)))
-    (cons 'progn
-	  (nconc
-	   (list
-	    (` (defun (, pred) (obj)
-		 (and (vectorp obj)
-		      (eq (elt obj 0) '(, name))
-		      ))
-	       )
-	    (` (defun (, (symbol-concat name '/create)) (, slots)
-		 (, (cons 'vector (cons (list 'quote name) slots)))
-		 )
-	       ))
-	   (let ((i 1))
-	     (mapcar (function
-		      (lambda (slot)
-			(prog1
-			    (` (defun (, (symbol-concat name '/ slot)) (obj)
-				 (if ((, pred) obj)
-				     (elt obj (, i))
-				   ))
-			       )
-			  (setq i (+ i 1))
-			  )
-			)) slots)
-	     )
-	   (list (list 'quote name))
-	   ))))
-
 
 ;;; @ field parser
 ;;;
 
-(defsubst regexp-* (regexp)
-  (concat regexp "*"))
-
-(defconst rfc822/quoted-pair-regexp "\\\\.")
-(defconst rfc822/qtext-regexp
-  (concat "[^" (char-list-to-string std11-non-qtext-char-list) "]"))
-(defconst rfc822/quoted-string-regexp
-  (concat "\""
-	  (regexp-*
-	   (regexp-or rfc822/qtext-regexp rfc822/quoted-pair-regexp)
-	   )
-	  "\""))
-
 (defconst mime/content-parameter-value-regexp
   (concat "\\("
-	  rfc822/quoted-string-regexp
+	  std11-quoted-string-regexp
 	  "\\|[^; \t\n]*\\)"))
 
 (defconst mime::parameter-regexp
@@ -106,6 +52,16 @@ which are string or symbol."
 	 (substring str e)
 	 ))))
 
+
+;;; @ Content-Type
+;;;
+
+(defsubst make-mime-content-type (type subtype &optional parameters)
+  (list* (cons 'type type)
+	 (cons 'subtype subtype)
+	 (nreverse parameters))
+  )
+
 (defun mime-parse-Content-Type (string)
   "Parse STRING as field-body of Content-Type field.
 Return value is
@@ -125,9 +81,38 @@ are string."
 	  (setq dest (cons (car ret) dest)
 		string (cdr ret))
 	  )
-	(cons (intern type) (cons (intern subtype) (nreverse dest)))
+	(make-mime-content-type (intern type)(intern subtype)
+				(nreverse dest))
 	)))
 
+(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
+`mime-parse-Content-Type'."
+  (let ((str (std11-field-body "Content-Type")))
+    (if str
+	(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)
 
@@ -136,94 +121,119 @@ are string."
   (setq string (std11-unfold-string string))
   (if (string-match `,(concat "^" mime-disposition-type-regexp) string)
       (let* ((e (match-end 0))
-	     (ctype (downcase (substring string 0 e)))
+	     (type (downcase (substring string 0 e)))
 	     ret dest)
 	(setq string (substring string e))
 	(while (setq ret (mime-parse-parameter string))
 	  (setq dest (cons (car ret) dest)
 		string (cdr ret))
 	  )
-	(cons ctype (nreverse dest))
+	(cons (cons 'type (intern type))
+	      (nreverse dest))
 	)))
 
+(defun mime-read-Content-Disposition ()
+  "Read field-body of Content-Disposition field from current-buffer,
+and return parsed it."
+  (let ((str (std11-field-body "Content-Disposition")))
+    (if str
+	(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"))
 
-;;; @ field reader
+
+;;; @ Content-Transfer-Encoding
 ;;;
 
-(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
-`mime-parse-Content-Type'."
-  (let ((str (std11-field-body "Content-Type")))
-    (if str
-	(mime-parse-Content-Type str)
-      )))
+(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))
 
-(defun mime/Content-Transfer-Encoding (&optional default-encoding)
+(defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
   "Read field-body of Content-Transfer-Encoding field from
 current-buffer, and return it.
-If is is not found, return DEFAULT-ENCODING. [mime-parse.el]"
+If is is not found, return DEFAULT-ENCODING."
   (let ((str (std11-field-body "Content-Transfer-Encoding")))
     (if str
-	(progn
-	  (if (string-match "[ \t\n\r]+$" str)
-	      (setq str (substring str 0 (match-beginning 0)))
-	    )
-	  (downcase str)
-	  )
-      default-encoding)
-    ))
-
-(defun mime/Content-Disposition ()
-  "Read field-body of Content-Disposition field from current-buffer,
-and return parsed it. [mime-parse.el]"
-  (let ((str (std11-field-body "Content-Disposition")))
-    (if str
-	(mime-parse-Content-Disposition str)
-      )))
+	(mime-parse-Content-Transfer-Encoding str)
+      default-encoding)))
 
 
 ;;; @ message parser
 ;;;
 
-(define-structure mime::content-info
-  rcnum point-min point-max type parameters encoding children)
-
-(defsubst make-mime-entity-info (rcnum
-				 point-min point-max
-				 media-type media-subtype
-				 parameters encoding children)
-  (let ((ctype (if media-type
-		   (if media-subtype
-		       (format "%s/%s" media-type media-subtype)
-		     (symbol-name media-type)))))
-    (mime::content-info/create rcnum point-min point-max
-			       ctype params encoding
-			       children)
-    ))
-
-(defun mime-parse-multipart (boundary primtype subtype params encoding rcnum)
+(defsubst make-mime-entity (node-id header-start header-end
+				    body-start body-end
+				    content-type content-disposition
+				    encoding children)
+  (vector node-id
+	  header-start header-end body-start body-end
+	  content-type content-disposition encoding children))
+
+(defsubst mime-entity-node-id (entity)             (aref entity 0))
+(defsubst mime-entity-header-start (entity)        (aref entity 1))
+(defsubst mime-entity-header-end (entity)          (aref entity 2))
+(defsubst mime-entity-body-start (entity)          (aref entity 3))
+(defsubst mime-entity-body-end (entity)            (aref entity 4))
+(defsubst mime-entity-content-type (entity)        (aref entity 5))
+(defsubst mime-entity-content-disposition (entity) (aref entity 6))
+(defsubst mime-entity-encoding (entity)            (aref entity 7))
+(defsubst mime-entity-children (entity)            (aref entity 8))
+
+(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)
   (goto-char (point-min))
-  (let* ((dash-boundary   (concat "--" boundary))
+  (let* ((dash-boundary
+	  (concat "--"
+		  (std11-strip-quoted-string
+		   (mime-content-type-parameter content-type "boundary"))))
 	 (delimiter       (concat "\n" (regexp-quote dash-boundary)))
 	 (close-delimiter (concat delimiter "--[ \t]*$"))
-	 (beg (point-min))
-	 (end (progn
-		(goto-char (point-max))
-		(if (re-search-backward close-delimiter nil t)
-		    (match-beginning 0)
-		  (point-max)
-		  )))
 	 (rsep (concat delimiter "[ \t]*\n"))
 	 (dc-ctl
-	  (if (eq subtype 'digest)
-	      '(message rfc822)
-	    '(text plain)
+	  (if (eq (mime-content-type-subtype content-type) 'digest)
+	      (make-mime-content-type 'message 'rfc822)
+	    (make-mime-content-type 'text 'plain)
 	    ))
 	 cb ce ret ncb children (i 0))
+    (goto-char body-end)
+    (if (re-search-backward close-delimiter nil t)
+	(setq body-end (match-beginning 0))
+      )
     (save-restriction
-      (narrow-to-region beg end)
-      (goto-char beg)
+      (narrow-to-region header-end body-end)
+      (goto-char header-start)
       (re-search-forward rsep nil t)
       (setq cb (match-end 0))
       (while (re-search-forward rsep nil t)
@@ -231,67 +241,99 @@ and return parsed it. [mime-parse.el]"
 	(setq ncb (match-end 0))
 	(save-restriction
 	  (narrow-to-region cb ce)
-	  (setq ret (mime-parse-message dc-ctl "7bit" (cons i rcnum)))
+	  (setq ret (mime-parse-message dc-ctl "7bit" (cons i node-id)))
 	  )
 	(setq children (cons ret children))
-	(goto-char (mime::content-info/point-max ret))
+	(goto-char (mime-entity-point-max ret))
 	(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 rcnum)))
+	(setq ret (mime-parse-message dc-ctl "7bit" (cons i node-id)))
 	)
       (setq children (cons ret children))
       )
-    (make-mime-entity-info rcnum beg (point-max)
-			   primtype subtype params encoding
-			   (nreverse children))
+    (make-mime-entity node-id
+		      header-start header-end
+		      body-start body-end
+		      content-type content-disposition encoding
+		      (nreverse children))
     ))
 
-(defun mime-parse-message (&optional default-ctl default-encoding rcnum)
+(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."
-  (setq default-ctl (or (mime-read-Content-Type) default-ctl))
-  (let ((primtype (car default-ctl))
-	(subtype (car (cdr default-ctl)))
-	(params (cdr (cdr default-ctl)))
-	(encoding (or (mime/Content-Transfer-Encoding) default-encoding))
-	)
-    (let ((boundary (assoc "boundary" params)))
-      (cond (boundary
-	     (setq boundary (std11-strip-quoted-string (cdr boundary)))
-	     (mime-parse-multipart
-	      boundary
-	      primtype subtype params encoding rcnum)
-	     )
-	    ((and (eq primtype 'message)
-		  (memq subtype '(rfc822 news))
-		  )
-	     (goto-char (point-min))
-	     (make-mime-entity-info rcnum
-				    (point-min) (point-max)
-				    primtype subtype params encoding
-				    (save-restriction
-				      (narrow-to-region
-				       (if (re-search-forward "^$" nil t)
-					   (1+ (match-end 0))
-					 (point-min)
-					 )
-				       (point-max))
-				      (list (mime-parse-message
-					     nil nil (cons 0 rcnum)))
-				      ))
-	     )
-	    (t 
-	     (make-mime-entity-info rcnum (point-min) (point-max)
-				    primtype subtype params encoding
-				    nil)
-	     ))
-      )))
+  (let ((header-start (point-min))
+	header-end
+	body-start
+	(body-end (point-max))
+	content-type content-disposition encoding
+	primary-type)
+    (goto-char header-start)
+    (if (re-search-forward "^$" nil t)
+	(setq header-end (match-end 0)
+	      body-start (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)
+	    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))
+      )
+    (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)
+		      ))
+           (make-mime-entity node-id
+			     header-start header-end
+			     body-start body-end
+			     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 node-id
+			     header-start header-end
+			     body-start body-end
+			     content-type content-disposition encoding nil)
+	   ))
+    ))
+
+
+;;; @ utilities
+;;;
+
+(defsubst mime-root-entity-p (entity)
+  "Return t if ENTITY is root-entity (message)."
+  (null (mime-entity-node-id entity)))
 
 
 ;;; @ end