update.

[elisp/flim.git] / mel-b-dl.el

diff --git a/mel-b-dl.el b/mel-b-dl.el
index 411fa74..76758c0 100644 (file)
--- a/mel-b-dl.el
+++ b/mel-b-dl.el
@@ -1,11 +1,11 @@
-;;; mel-b-dl.el: Base64 encoder/decoder using DL module
+;;; mel-b-dl.el --- Base64 encoder/decoder using DL module.
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: MIME, Base64
 
-;; This file is part of MEL (MIME Encoding Library).
+;; 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
@@ -18,66 +18,64 @@
 ;; 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.
+;; along with this program; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
-(require 'poe)
 (require 'mime-def)
 
-(eval-and-compile
-  (defvar base64-dl-handle
-    (and (file-exists-p base64-dl-module)
-        (dynamic-link base64-dl-module)))
+(defvar base64-dl-handle
+  (and (stringp base64-dl-module)
+       (file-exists-p base64-dl-module)
+       (dynamic-link base64-dl-module)))
 
-  (dynamic-call "emacs_base64_init" base64-dl-handle)
-  )
+(dynamic-call "emacs_base64_init" base64-dl-handle)
+
+;; base64-dl-module provides `encode-base64-string' and `decode-base64-string'.
+(defalias 'base64-encode-string 'encode-base64-string)
+(defalias 'base64-decode-string 'decode-base64-string)
 
 (defun base64-encode-region (start end)
   "Encode current region by base64.
 START and END are buffer positions."
-  (interactive "r")
-  (let ((str (buffer-substring start end)))
-    (delete-region start end)
-    (insert (encode-base64-string str))
-    )
-  (or (bolp)
-      (insert "\n"))
-  )
-
-(defun decode-base64-region (start end)
+  (interactive "*r")
+  (insert
+    (prog1
+       (base64-encode-string
+        (buffer-substring start end))
+      (delete-region start end)))
+  (or (bolp) (insert ?\n)))
+
+(defun base64-decode-region (start end)
   "Decode current region by base64.
 START and END are buffer positions."
-  (interactive "r")
-  (let ((str (buffer-substring start end)))
-    (delete-region start end)
-    (condition-case err
-       (insert (decode-base64-string str))
-      (error (message (nth 1 err)))
-      )))
-
-(defalias 'base64-encode-string 'encode-base64-string)
-(defalias 'base64-decode-string 'decode-base64-string)
+  (interactive "*r")
+  (insert
+   (prog1
+       (base64-decode-string
+       (buffer-substring start end))
+     (delete-region start end))))
 
 
 (mel-define-method-function (mime-encode-string string (nil "base64"))
-                           'encode-base64-string)
+                           'base64-encode-string)
 (mel-define-method-function (mime-decode-string string (nil "base64"))
-                           'decode-base64-string)
+                           'base64-decode-string)
 (mel-define-method-function (mime-encode-region start end (nil "base64"))
                            'base64-encode-region)
 (mel-define-method-function (mime-decode-region start end (nil "base64"))
-                           'decode-base64-region)
+                           'base64-decode-region)
 
 (mel-define-method-function (encoded-text-encode-string string (nil "B"))
-                           'encode-base64-string)
+                           'base64-encode-string)
 
 (mel-define-method encoded-text-decode-string (string (nil "B"))
-  (if (and (string-match B-encoded-text-regexp string)
-          (string= string (match-string 0 string)))
-      (decode-base64-string string)
+  (if (string-match (eval-when-compile
+                     (concat "\\`" B-encoded-text-regexp "\\'"))
+                   string)
+      (base64-decode-string string)
     (error "Invalid encoded-text %s" string)))
 
 
@@ -89,28 +87,23 @@ START and END are buffer positions."
 It calls external base64 encoder specified by
 `base64-external-encoder'.  So you must install the program (maybe
 mmencode included in metamail or XEmacs package)."
-  (interactive (list (read-file-name "Insert encoded file: ")))
-  (insert (encode-base64-string
+  (interactive "*fInsert encoded file: ")
+  (insert (base64-encode-string
           (with-temp-buffer
             (set-buffer-multibyte nil)
             (insert-file-contents-as-binary filename)
             (buffer-string))))
-  (or (bolp)
-      (insert "\n"))
-  )
+  (or (bolp) (insert ?\n)))
 
 ;; (mel-define-method mime-write-decoded-region (start end filename
 ;;                                                     (nil "base64"))
 ;;   "Decode and write current region encoded by base64 into FILENAME.
 ;; START and END are buffer positions."
-;;   (interactive
-;;    (list (region-beginning) (region-end)
-;;          (read-file-name "Write decoded region to file: ")))
+;;   (interactive "*r\nFWrite decoded region to file: ")
 ;;   (let ((str (buffer-substring start end)))
 ;;     (with-temp-buffer
-;;       (insert (decode-base64-string str))
-;;       (write-region-as-binary (point-min) (point-max) filename)
-;;       )))
+;;       (insert (base64-decode-string str))
+;;       (write-region-as-binary (point-min)(point-max) filename))))
 
 
 ;;; @ end