X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-parse.el;h=9f6a9aed17f3db70ffe512dda7b5f666a2cc7c07;hb=0c115c3068d06f197bf3cb99aad53c3a948a15a0;hp=b1d1b503bc2915698d2d624c59fe1ba3476ddf54;hpb=78ec3a204dcf807f9410a4495163fc2553f69894;p=elisp%2Fsemi.git diff --git a/mime-parse.el b/mime-parse.el index b1d1b50..9f6a9ae 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 -;; Version: $Id: mime-parse.el,v 0.14 1997-07-26 15:21:11 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 @@ -32,43 +31,12 @@ (defsubst symbol-concat (&rest args) "Return a symbol whose name is concatenation of arguments ARGS which are string or symbol." - (intern (apply (function concat) - (mapcar (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)) - )))) + (intern (mapconcat (function + (lambda (s) + (cond ((symbolp s) (symbol-name s)) + ((stringp s) s) + ))) + args ""))) ;;; @ field parser @@ -108,18 +76,25 @@ which are string or symbol." )))) (defun mime-parse-Content-Type (string) - "Parse STRING as field-body of Content-Type field." + "Parse STRING as field-body of Content-Type field. +Return value is + (PRIMARY-TYPE SUBTYPE (NAME1 . VALUE1)(NAME2 . VALUE2) ...) +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-media-type/subtype-regexp) string) - (let* ((e (match-end 0)) - (ctype (downcase (substring string 0 e))) + (if (string-match `,(concat "^\\(" mime-token-regexp + "\\)/\\(" mime-token-regexp "\\)") string) + (let* ((type (downcase + (substring string (match-beginning 1) (match-end 1)))) + (subtype (downcase + (substring string (match-beginning 2) (match-end 2)))) ret dest) - (setq string (substring string e)) + (setq string (substring string (match-end 0))) (while (setq ret (mime-parse-parameter string)) (setq dest (cons (car ret) dest) string (cdr ret)) ) - (cons ctype (nreverse dest)) + (cons (intern type) (cons (intern subtype) (nreverse dest))) ))) @@ -144,9 +119,10 @@ which are string or symbol." ;;; @ field reader ;;; -(defun mime/Content-Type () +(defun mime-read-Content-Type () "Read field-body of Content-Type field from current-buffer, -and return parsed it. [mime-parse.el]" +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) @@ -179,11 +155,31 @@ and return parsed it. [mime-parse.el]" ;;; @ message parser ;;; -(define-structure mime::content-info - rcnum point-min point-max type parameters encoding children) - - -(defun mime-parse-multipart (boundary ctype params encoding rcnum) +(defsubst make-mime-entity-info (rcnum + point-min point-max + media-type media-subtype parameters + encoding children) + (vector rcnum point-min point-max + media-type media-subtype parameters encoding children)) + +(defsubst mime-entity-info-rnum (entity-info) (aref entity-info 0)) +(defsubst mime-entity-info-point-min (entity-info) (aref entity-info 1)) +(defsubst mime-entity-info-point-max (entity-info) (aref entity-info 2)) +(defsubst mime-entity-info-media-type (entity-info) (aref entity-info 3)) +(defsubst mime-entity-info-media-subtype (entity-info) (aref entity-info 4)) +(defsubst mime-entity-info-parameters (entity-info) (aref entity-info 5)) +(defsubst mime-entity-info-encoding (entity-info) (aref entity-info 6)) +(defsubst mime-entity-info-children (entity-info) (aref entity-info 7)) + +(defsubst mime-entity-info-type/subtype (entity-info) + (let ((type (mime-entity-info-media-type entity-info))) + (if type + (let ((subtype (mime-entity-info-media-subtype entity-info))) + (if subtype + (format "%s/%s" type subtype) + (symbol-name type)))))) + +(defun mime-parse-multipart (boundary primtype subtype params encoding rcnum) (goto-char (point-min)) (let* ((dash-boundary (concat "--" boundary)) (delimiter (concat "\n" (regexp-quote dash-boundary))) @@ -197,9 +193,9 @@ and return parsed it. [mime-parse.el]" ))) (rsep (concat delimiter "[ \t]*\n")) (dc-ctl - (if (string-equal ctype "multipart/digest") - '("message/rfc822") - '("text/plain") + (if (eq subtype 'digest) + '(message rfc822) + '(text plain) )) cb ce ret ncb children (i 0)) (save-restriction @@ -215,7 +211,7 @@ and return parsed it. [mime-parse.el]" (setq ret (mime-parse-message dc-ctl "7bit" (cons i rcnum))) ) (setq children (cons ret children)) - (goto-char (mime::content-info/point-max ret)) + (goto-char (mime-entity-info-point-max ret)) (goto-char (setq cb ncb)) (setq i (1+ i)) ) @@ -226,45 +222,51 @@ and return parsed it. [mime-parse.el]" ) (setq children (cons ret children)) ) - (mime::content-info/create rcnum beg (point-max) - ctype params encoding - (nreverse children)) + (make-mime-entity-info rcnum beg (point-max) + primtype subtype params encoding + (nreverse children)) )) -(defun mime-parse-message (&optional ctl encoding rcnum) - "Parse current-buffer as a MIME message. [mime-parse.el]" - (setq ctl (or (mime/Content-Type) ctl)) - (setq encoding (or (mime/Content-Transfer-Encoding) encoding)) - (let ((ctype (car ctl)) - (params (cdr ctl)) +(defun mime-parse-message (&optional default-ctl default-encoding rcnum) + "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 ctype params encoding rcnum) + (mime-parse-multipart + boundary + primtype subtype params encoding rcnum) ) - ((or (string-equal ctype "message/rfc822") - (string-equal ctype "message/news") - ) + ((and (eq primtype 'message) + (memq subtype '(rfc822 news)) + ) (goto-char (point-min)) - (mime::content-info/create rcnum - (point-min) (point-max) - ctype 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))) - ) - ) + (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 - (mime::content-info/create rcnum (point-min) (point-max) - ctype params encoding nil) + (make-mime-entity-info rcnum (point-min) (point-max) + primtype subtype params encoding + nil) )) )))