Import Oort Gnus v0.15.

[elisp/gnus.git-] / lisp / pgg-gpg.el

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index a9f6494..79e6aab 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -1,6 +1,6 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
-;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
@@ -59,27 +59,22 @@
         (errors-buffer pgg-errors-buffer)
         (orig-mode (default-file-modes))
         (process-connection-type nil)
-        process status exit-status)
+        exit-status)
     (with-current-buffer (get-buffer-create errors-buffer)
       (buffer-disable-undo)
       (erase-buffer))
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (let ((coding-system-for-write 'binary))
-           (setq process
-                 (apply #'start-process "*GnuPG*" errors-buffer
-                        program args)))
-         (set-process-sentinel process #'ignore)
-         (when passphrase
-           (process-send-string process (concat passphrase "\n")))
-         (process-send-region process start end)
-         (process-send-eof process)
-         (while (eq 'run (process-status process))
-           (accept-process-output process 5))
-         (setq status (process-status process)
-               exit-status (process-exit-status process))
-         (delete-process process)
+          (let* ((coding-system-for-write 'binary)
+                 (input (buffer-substring-no-properties start end)))
+            (with-temp-buffer
+              (when passphrase
+                (insert passphrase "\n"))
+              (insert input)
+              (setq exit-status
+                    (apply #'call-process-region (point-min) (point-max) program
+                           nil errors-buffer nil args))))
          (with-current-buffer (get-buffer-create output-buffer)
            (buffer-disable-undo)
            (erase-buffer)
@@ -87,12 +82,8 @@
                (let ((coding-system-for-read 'raw-text-dos))
                  (insert-file-contents output-file-name)))
            (set-buffer errors-buffer)
-           (if (memq status '(stop signal))
-               (error "%s exited abnormally: '%s'" program exit-status))
-           (if (= 127 exit-status)
-               (error "%s could not be found" program))))
-      (if (and process (eq 'run (process-status process)))
-         (interrupt-process process))
+           (if (not (equal exit-status 0))
+               (error "%s exited abnormally: '%s'" program exit-status))))
       (if (file-exists-p output-file-name)
          (delete-file output-file-name))
       (set-default-file-modes orig-mode))))