Update copyright header.

[elisp/semi.git] / smime.el

diff --git a/smime.el b/smime.el
index a45d399..c5d09c9 100644 (file)
--- a/smime.el
+++ b/smime.el
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 
 ;;; Commentary:
@@ -39,7 +39,8 @@
 ;;; Code:
 
 (require 'path-util)
-(require 'raw-io)
+(require 'mel)
+;; binary-funcall, binary-write-decoded-region, binary-insert-encoded-file
 (eval-when-compile (require 'static))
 
 (defgroup smime ()
@@ -192,9 +193,7 @@
        (pop files)))))
 
 (defun smime-process-region (start end program args)
-  (let* ((errors-file-name
-         (concat temporary-file-directory 
-                 (make-temp-name "smime-errors")))
+  (let* ((errors-file-name (make-temp-file "smime-errors"))
         (args (append args (list (concat "2>" errors-file-name))))
         (shell-file-name smime-shell-file-name)
         (shell-command-switch smime-shell-command-switch)
@@ -204,8 +203,9 @@
       (buffer-disable-undo)
       (erase-buffer))
     (setq process
-         (apply #'binary-start-process-shell-command "*S/MIME*"
-                smime-output-buffer program args))
+         (apply #'binary-funcall #'start-process-shell-command
+                "*S/MIME*" smime-output-buffer
+                program args))
     (set-process-sentinel process 'ignore)
     (process-send-region process start end)
     (process-send-eof process)
@@ -295,18 +295,17 @@ a detached signature."
   "Verify the current region between START and END.
 If the optional 3rd argument SIGNATURE is non-nil, it is treated as
 the detached signature of the current region."
-  (let* ((basename (expand-file-name "smime" temporary-file-directory))
-        (orig-file (make-temp-name basename))
+  (let* ((orig-file (make-temp-file "smime"))
         (orig-mode (default-file-modes)))
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (binary-write-region start end orig-file))
+         (binary-write-decoded-region start end orig-file))
       (set-default-file-modes orig-mode))
     (with-temp-buffer
-      (binary-insert-file-contents signature)
+      (binary-insert-encoded-file signature)
       (goto-char (point-max))
-      (binary-insert-file-contents
+      (binary-insert-encoded-file
        (or (smime-find-certificate 
            (smime-query-signer (point-min)(point-max)))
           (expand-file-name