From: morioka Date: Thu, 18 Jun 1998 11:36:32 +0000 (+0000) Subject: Sync up with chao-1_3_0_9. X-Git-Tag: flim-1_4_0~3 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cdfa9c3b42df888f31ce865cf48470928e7a3ba;p=elisp%2Fflim.git Sync up with chao-1_3_0_9. --- diff --git a/ChangeLog b/ChangeLog index 9ff431d..33a9da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +1998-06-17 MORIOKA Tomohiko + + * mime-parse.el: Require 'cl when it is compiled. + + * eword-decode.el (eword-visible-field-p): New function. + (mime-insert-decoded-header): Use `eword-visible-field-p'. + +1998-06-17 MORIOKA Tomohiko + + * mime-def.el (mime-library-version-string): Renamed from + `mime-spadework-module-version-string'. + + * mime-parse.el: New file; moved from SEMI layer. + + * FLIM-ELS (flim-modules): Add `mime-parse'. + +1998-06-17 MORIOKA Tomohiko + + * FLIM-ELS (flim-modules): Add `mime-lib'. + + * mime-lib.el: New module. + + * mime-def.el (mime-entity): Add new slots for original-header and + parsed-header. + (mime-entity-set-original-header): New function. + (mime-entity-set-parsed-header): New function. + +1998-06-16 MORIOKA Tomohiko + + * mime-def.el (mime-entity-number): New function (moved from SEMI + layer). + +1998-06-16 MORIOKA Tomohiko + + * mime-def.el: Move definition of structure `mime-entity' from + SEMI layer. + +1998-06-16 MORIOKA Tomohiko + + * eword-decode.el (eword-decode-ignored-field-list): Capitalize + default value. + (eword-decode-structured-field-list): Capitalize default value. + (eword-decode-header): Regularize field name by `capitalize'. + (mime-insert-decoded-header): New function. + 1998-06-15 MORIOKA Tomohiko * mailcap.el (mailcap-file): Use `defcustom'. diff --git a/FLIM-ELS b/FLIM-ELS index e388991..a5a4034 100644 --- a/FLIM-ELS +++ b/FLIM-ELS @@ -8,7 +8,7 @@ mime-def mel mel-dl mel-b mel-q mel-u mel-g eword-decode eword-encode - mailcap)) + mime-lib mime-parse mailcap)) (if (fboundp 'dynamic-link) (setq flim-modules (cons 'mel-dl flim-modules)) diff --git a/FLIM-VERSION b/FLIM-VERSION index 6b4c994..df046fc 100644 --- a/FLIM-VERSION +++ b/FLIM-VERSION @@ -12,7 +12,7 @@ 1.2.1 Kamitobaguchi $(B>eD;1)8}(B 1.2.2 Takeda $(BC]ED(B ; = $(B5~ET;T8rDL6I(B $(B1(4]@~(B 1.3.0 Fushimi $(BIz8+(B -1.3.1 Kintetsu-Tanbabashi $(B6aE4C0GH66(B +1.4.0 Kintetsu-Tanbabashi $(B6aE4C0GH66(B ; <=> $(B5~:e(B $(BC0GH66(B [Chao Version names] @@ -25,3 +25,4 @@ ;;------------------------------------------------------------------------- 1.2.0 Takeda $(BC]ED(B ; = $(B6aE4(B $(B5~ET@~(B 1.3.0 Kuinabashi $(B$/$$$J66(B +1.4.0 J-Dþjò-A $(B==>r(B diff --git a/eword-decode.el b/eword-decode.el index 0bf4f54..0e3f3ca 100644 --- a/eword-decode.el +++ b/eword-decode.el @@ -171,17 +171,17 @@ such as a version of Net$cape)." ;;; (defcustom eword-decode-ignored-field-list - '(newsgroups path lines nntp-posting-host received message-id date) + '(Newsgroups Path Lines Nntp-Posting-Host Received Message-Id Date) "*List of field-names to be ignored when decoding. Each field name must be symbol." :group 'eword-decode :type '(repeat symbol)) (defcustom eword-decode-structured-field-list - '(reply-to resent-reply-to from resent-from sender resent-sender - to resent-to cc resent-cc bcc resent-bcc dcc - mime-version content-type content-transfer-encoding - content-disposition) + '(Reply-To Resent-Reply-To From Resent-From Sender Resent-Sender + To Resent-To Cc Resent-Cc Bcc Resent-Bcc Dcc + Mime-Version Content-Type Content-Transfer-Encoding + Content-Disposition) "*List of field-names to decode as structured field. Each field name must be symbol." :group 'eword-decode @@ -211,7 +211,7 @@ If SEPARATOR is not nil, it is used as header separator." p (match-end 0) field-name (buffer-substring beg (1- p)) len (string-width field-name) - field-name (intern (downcase field-name)) + field-name (intern (capitalize field-name)) end (std11-field-end)) (cond ((memq field-name eword-decode-ignored-field-list) ;; Don't decode @@ -254,6 +254,83 @@ If SEPARATOR is not nil, it is used as header separator." )) ))) +(defun eword-visible-field-p (field-name visible-fields invisible-fields) + (or (catch 'found + (while visible-fields + (let ((regexp (car visible-fields))) + (if (string-match regexp field-name) + (throw 'found t) + )) + (setq visible-fields (cdr visible-fields)) + )) + (catch 'found + (while invisible-fields + (let ((regexp (car invisible-fields))) + (if (string-match regexp field-name) + (throw 'found nil) + )) + (setq invisible-fields (cdr invisible-fields)) + ) + t))) + +(defun mime-insert-decoded-header (entity + &optional invisible-fields visible-fields + code-conversion) + "Insert before point a decoded header of ENTITY." + (let ((default-charset + (if code-conversion + (if (mime-charset-to-coding-system code-conversion) + code-conversion + default-mime-charset)))) + (save-restriction + (narrow-to-region (point)(point)) + (let ((the-buf (current-buffer)) + (src-buf (mime-entity-buffer entity)) + (h-end (mime-entity-header-end entity)) + beg p end field-name len field) + (save-excursion + (set-buffer src-buf) + (goto-char (mime-entity-header-start entity)) + (save-restriction + (narrow-to-region (point) h-end) + (while (re-search-forward std11-field-head-regexp nil t) + (setq beg (match-beginning 0) + p (match-end 0) + field-name (buffer-substring beg (1- p)) + len (string-width field-name) + end (std11-field-end)) + (when (eword-visible-field-p field-name + visible-fields invisible-fields) + (setq field (intern (capitalize field-name))) + (save-excursion + (set-buffer the-buf) + (insert field-name) + (insert ":") + (cond ((memq field eword-decode-ignored-field-list) + ;; Don't decode + (insert-buffer-substring src-buf p end) + ) + ((memq field-name eword-decode-structured-field-list) + ;; Decode as structured field + (let ((body (save-excursion + (set-buffer src-buf) + (buffer-substring p end))) + (default-mime-charset default-charset)) + (insert (eword-decode-and-fold-structured-field + body (1+ len))) + )) + (t + ;; Decode as unstructured field + (let ((body (save-excursion + (set-buffer src-buf) + (buffer-substring p end))) + (default-mime-charset default-charset)) + (insert (eword-decode-unstructured-field-body + body (1+ len))) + ))) + (insert "\n") + ))))))))) + ;;; @ encoded-word decoder ;;; diff --git a/mime-def.el b/mime-def.el index a906efd..39258e1 100644 --- a/mime-def.el +++ b/mime-def.el @@ -24,8 +24,7 @@ ;;; Code: -(defconst mime-spadework-module-version-string - "FLIM 1.3.1 - \"Kintetsu-Tanbabashi\"") +(defconst mime-library-version-string "FLIM 1.4.0 - \"Kintetsu-Tanbabashi\"") ;;; @ variables @@ -120,6 +119,40 @@ "][" quoted-printable-hex-chars "]")) +;;; @ MIME-entity +;;; + +(defsubst make-mime-entity (buffer + header-start header-end body-start body-end + &optional node-id + content-type content-disposition + encoding children) + (vector buffer header-start header-end body-start body-end + node-id content-type content-disposition encoding nil + children nil)) + +(defsubst mime-entity-buffer (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-node-id (entity) (aref entity 5)) +(defsubst mime-entity-content-type (entity) (aref entity 6)) +(defsubst mime-entity-content-disposition (entity) (aref entity 7)) +(defsubst mime-entity-encoding (entity) (aref entity 8)) +(defsubst mime-entity-original-header (entity) (aref entity 9)) +(defsubst mime-entity-children (entity) (aref entity 10)) +(defsubst mime-entity-parsed-header (entity) (aref entity 11)) + +(defsubst mime-entity-set-original-header (entity header) + (aset entity 9 header)) +(defsubst mime-entity-set-parsed-header (entity header) + (aset entity 11 header)) + +(defsubst mime-entity-number (entity) + (reverse (mime-entity-node-id entity))) + + ;;; @ utility ;;; diff --git a/mime-lib.el b/mime-lib.el new file mode 100644 index 0000000..955b53f --- /dev/null +++ b/mime-lib.el @@ -0,0 +1,98 @@ +;;; mime-lib.el --- MIME library module + +;; Copyright (C) 1998 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Keywords: MIME, multimedia, mail, news + +;; This file is part of FLIM (Faithful Library about Internet Message). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Code: + +(require 'alist) +(require 'std11) +(require 'mime-def) +(require 'eword-decode) + +(defun mime-entity-fetch-field (entity field-name) + (or (symbolp field-name) + (setq field-name (intern (capitalize (capitalize field-name))))) + (let* ((header (mime-entity-original-header entity)) + (field-body (cdr (assq field-name header)))) + (or field-body + (progn + (if (save-excursion + (set-buffer (mime-entity-buffer entity)) + (save-restriction + (narrow-to-region (mime-entity-header-start entity) + (mime-entity-header-end entity)) + (setq field-body + (std11-fetch-field (symbol-name field-name))) + )) + (mime-entity-set-original-header + entity (put-alist field-name field-body header)) + ) + field-body)))) + +(defun mime-entity-read-field (entity field-name) + (or (symbolp field-name) + (setq field-name (capitalize (capitalize field-name)))) + (cond ((eq field-name 'Content-Type) + (mime-entity-content-type entity) + ) + ((eq field-name 'Content-Disposition) + (mime-entity-content-disposition entity) + ) + ((eq field-name 'Content-Transfer-Encoding) + (mime-entity-encoding entity) + ) + (t + (let* ((header (mime-entity-parsed-header entity)) + (field (cdr (assq field-name header)))) + (or field + (let ((field-body (mime-entity-fetch-field entity field-name))) + (when field-body + (cond ((memq field-name '(From + To Recent-To + Cc Recent-Cc + Bcc Resent-Bcc)) + (setq field (std11-parse-addresses + (eword-lexical-analyze field-body))) + ) + ((eq field-name 'Sender) + (setq field (std11-parse-address + (eword-lexical-analyze field-body))) + ) + ((memq field-name eword-decode-structured-field-list) + (setq field (eword-decode-structured-field-body + field-body))) + (t + (setq field (eword-decode-unstructured-field-body + field-body)) + )) + (mime-entity-set-parsed-header + entity (put-alist field-name field header)) + field))))))) + + +;;; @ end +;;; + +(provide 'mime-lib) + +;;; mime-lib.el ends here diff --git a/mime-parse.el b/mime-parse.el new file mode 100644 index 0000000..287e14d --- /dev/null +++ b/mime-parse.el @@ -0,0 +1,329 @@ +;;; mime-parse.el --- MIME message parser + +;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Keywords: parse, MIME, multimedia, mail, news + +;; 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 +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Code: + +(require 'emu) +(require 'std11) +(require 'mime-def) + +(eval-when-compile (require 'cl)) + + +;;; @ field parser +;;; + +(defconst mime/content-parameter-value-regexp + (concat "\\(" + std11-quoted-string-regexp + "\\|[^; \t\n]*\\)")) + +(defconst mime::parameter-regexp + (concat "^[ \t]*\;[ \t]*\\(" mime-token-regexp "\\)" + "[ \t]*=[ \t]*\\(" mime/content-parameter-value-regexp "\\)")) + +(defun mime-parse-parameter (str) + (if (string-match mime::parameter-regexp str) + (let ((e (match-end 2))) + (cons + (cons (downcase (substring str (match-beginning 1) (match-end 1))) + (std11-strip-quoted-string + (substring str (match-beginning 2) e)) + ) + (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 + (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-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 (match-end 0))) + (while (setq ret (mime-parse-parameter string)) + (setq dest (cons (car ret) dest) + string (cdr ret)) + ) + (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) + +(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) + (let* ((e (match-end 0)) + (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 (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")) + + +;;; @ Content-Transfer-Encoding +;;; + +(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-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." + (let ((str (std11-field-body "Content-Transfer-Encoding"))) + (if str + (mime-parse-Content-Transfer-Encoding str) + default-encoding))) + + +;;; @ message parser +;;; + +(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 "--" + (std11-strip-quoted-string + (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) + )) + cb ce ret ncb children (i 0)) + (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-start) + (re-search-forward rsep nil t) + (setq cb (match-end 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 dc-ctl "7bit" (cons i node-id))) + ) + (setq children (cons ret children)) + (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 node-id))) + ) + (setq children (cons ret children)) + ) + (make-mime-entity (current-buffer) + header-start header-end body-start body-end + node-id content-type content-disposition encoding + (nreverse children)) + )) + +(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." + (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 (current-buffer) + header-start header-end body-start body-end + node-id + 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 (current-buffer) + header-start header-end body-start body-end + node-id + 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 +;;; + +(provide 'mime-parse) + +;;; mime-parse.el ends here