Merge flim-1_12_6.

[elisp/flim.git] / mmbuffer.el

diff --git a/mmbuffer.el b/mmbuffer.el
index bf6a88e..38432fb 100644 (file)
--- a/mmbuffer.el
+++ b/mmbuffer.el
@@ -1,6 +1,6 @@
 ;;; mmbuffer.el --- MIME entity module for binary buffer
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: MIME, multimedia, mail, news
@@ -24,21 +24,52 @@
 
 ;;; Code:
 
-(require 'mime)
+(require 'mmgeneric)
 
-(defun mmbuffer-open-entity (location)
-  (mime-parse-buffer location)
-  )
+(mm-define-backend buffer (generic))
 
-(defun mmbuffer-entity-point-min (entity)
-  (mime-entity-header-start-internal entity)
-  )
+(mm-define-method initialize-instance ((entity buffer))
+  (mime-entity-set-buffer-internal
+   entity (mime-entity-location-internal entity))
+  (save-excursion
+    (set-buffer (mime-entity-buffer-internal entity))
+    (setq mime-message-structure entity)
+    (let ((header-start (point-min))
+         header-end
+         body-start
+         (body-end (point-max)))
+      (goto-char header-start)
+      (if (re-search-forward "^$" nil t)
+         (setq header-end (match-end 0)
+               body-start (if (= header-end body-end)
+                              body-end
+                            (1+ header-end)))
+       (setq header-end (point-min)
+             body-start (point-min)))
+      (save-restriction
+       (narrow-to-region header-start header-end)
+       (mime-entity-set-content-type-internal
+        entity
+        (let ((str (std11-fetch-field "Content-Type")))
+          (if str
+              (mime-parse-Content-Type str)
+            )))
+       )
+      (mime-entity-set-header-start-internal entity header-start)
+      (mime-entity-set-header-end-internal entity header-end)
+      (mime-entity-set-body-start-internal entity body-start)
+      (mime-entity-set-body-end-internal entity body-end)
+      )))
 
-(defun mmbuffer-entity-point-max (entity)
-  (mime-entity-body-end-internal entity)
-  )
+;;; redefine to speed up
+
+(mm-define-method entity-point-min ((entity buffer))
+  (mime-entity-header-start-internal entity))
 
-(defun mmbuffer-fetch-field (entity field-name)
+(mm-define-method entity-point-max ((entity buffer))
+  (mime-entity-body-end-internal entity))
+
+(mm-define-method fetch-field ((entity buffer) field-name)
   (save-excursion
     (set-buffer (mime-entity-buffer-internal entity))
     (save-restriction
@@ -47,9 +78,7 @@
       (std11-fetch-field field-name)
       )))
 
-(defun mmbuffer-cooked-p () nil)
-
-(defun mmbuffer-entity-content (entity)
+(mm-define-method entity-content ((entity buffer))
   (save-excursion
     (set-buffer (mime-entity-buffer-internal entity))
     (mime-decode-string
@@ -57,7 +86,14 @@
                       (mime-entity-body-end-internal entity))
      (mime-entity-encoding entity))))
 
-(defun mmbuffer-write-entity-content (entity filename)
+(mm-define-method insert-entity-content ((entity buffer))
+  (insert (with-current-buffer (mime-entity-buffer-internal entity)
+           (mime-decode-string
+            (buffer-substring (mime-entity-body-start-internal entity)
+                              (mime-entity-body-end-internal entity))
+            (mime-entity-encoding entity)))))
+
+(mm-define-method write-entity-content ((entity buffer) filename)
   (save-excursion
     (set-buffer (mime-entity-buffer-internal entity))
     (mime-write-decoded-region (mime-entity-body-start-internal entity)
@@ -66,11 +102,26 @@
                               (or (mime-entity-encoding entity) "7bit"))
     ))
 
-(defun mmbuffer-write-entity (entity filename)
+(mm-define-method insert-entity ((entity buffer))
+  (insert-buffer-substring (mime-entity-buffer-internal entity)
+                          (mime-entity-header-start-internal entity)
+                          (mime-entity-body-end-internal entity))
+  )
+
+(mm-define-method write-entity ((entity buffer) filename)
+  (save-excursion
+    (set-buffer (mime-entity-buffer-internal entity))
+    (write-region-as-raw-text-CRLF (mime-entity-header-start-internal entity)
+                                  (mime-entity-body-end-internal entity)
+                                  filename)
+    ))
+
+(mm-define-method write-entity-body ((entity buffer) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer entity))
-    (write-region-as-binary (mime-entity-point-min entity)
-                           (mime-entity-point-max entity) filename)
+    (set-buffer (mime-entity-buffer-internal entity))
+    (write-region-as-binary (mime-entity-body-start-internal entity)
+                           (mime-entity-body-end-internal entity)
+                           filename)
     ))