(std11-lexical-analyze): Change interface to add new optional argument

[elisp/flim.git] / mime-parse.el

diff --git a/mime-parse.el b/mime-parse.el
index f971f8c..e22747d 100644 (file)
--- 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,7 +24,7 @@
 
 ;;; Code:
 
-(require 'emu)
+;;(require 'emu)
 (require 'std11)
 (require 'mime-def)
 
@@ -96,13 +96,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 +134,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))
+       token)
+    (while (and tokens
+               (setq token (car tokens))
+               (std11-ignored-token-p token))
+      (setq tokens (cdr tokens)))
+    (if token
+       (if (eq (car token) 'atom)
+           (downcase (cdr token))
+         ))))
 
 ;;;###autoload
 (defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
@@ -184,7 +193,7 @@ If is is not found, return DEFAULT-ENCODING."
              (setq ncb (match-end 0))
              (save-restriction
                (narrow-to-region cb ce)
-               (setq ret (mime-parse-message dc-ctl representation-type
+               (setq ret (mime-parse-message representation-type dc-ctl
                                              entity (cons i node-id)))
                )
              (setq children (cons ret children))
@@ -194,16 +203,16 @@ If is is not found, return DEFAULT-ENCODING."
            (setq ce (point-max))
            (save-restriction
              (narrow-to-region cb ce)
-             (setq ret (mime-parse-message dc-ctl representation-type
+             (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 'application 'octet-stream))
-       )))
-  entity)
+        entity (make-mime-content-type 'message 'x-broken))
+       nil)
+      )))
 
 (defun mime-parse-encapsulated (entity)
   (mime-entity-set-children-internal
@@ -212,22 +221,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 (mime-entity-representation-type-internal entity)
+           (mime-entity-representation-type-internal entity) nil
            entity (cons 0 (mime-entity-node-id-internal entity))))
-     ))
-  entity)
-
-(defun mime-parse-message (&optional default-ctl representation-type
-                                    parent 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)
@@ -242,25 +246,18 @@ 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 (or representation-type 'buffer)
-                                           (current-buffer)
-                                           content-type nil parent node-id
-                                           (current-buffer)
-                                           header-start header-end
-                                           body-start body-end))
-    (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
+                              nil nil nil nil
+                              nil nil nil nil
+                              nil nil
+                              (current-buffer)
+                              header-start header-end
+                              body-start body-end)
+    ))
 
 
 ;;; @ for buffer
@@ -273,7 +270,7 @@ If buffer is omitted, it parses current-buffer."
   (save-excursion
     (if buffer (set-buffer buffer))
     (setq mime-message-structure
-         (mime-parse-message nil representation-type))
+         (mime-parse-message (or representation-type 'buffer) nil))
     ))