(pgg-pgp-snarf-keys-region): do.
* pgg-pgp5.el (pgg-pgp5-verify-region)
(pgg-pgp5-snarf-keys-region, pgg-pgp5-process-region): Use it.
* pgg.el (pgg-make-temp-file): New function. `make-temp-name' is
unsafe.
(pgg-temporary-file-directory): Remove.
+2003-04-03 Jesper Harder <harder@ifa.au.dk>
+
+ * pgg-gpg.el (pgg-gpg-process-region): do.
+
+ * pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)
+ (pgg-pgp-snarf-keys-region): do.
+
+ * pgg-pgp5.el (pgg-pgp5-verify-region)
+ (pgg-pgp5-snarf-keys-region, pgg-pgp5-process-region): Use it.
+
+ * pgg.el (pgg-make-temp-file): New function. `make-temp-name' is
+ unsafe.
+ (pgg-temporary-file-directory): Remove.
+
2003-04-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lpath.el: Fbind Info-directory and Info-menu.
2003-04-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lpath.el: Fbind Info-directory and Info-menu.
2003-03-18 Jesper Harder <harder@ifa.au.dk>
* mm-bodies.el (mm-decode-coding-region-safely): Don't use
2003-03-18 Jesper Harder <harder@ifa.au.dk>
* mm-bodies.el (mm-decode-coding-region-safely): Don't use
- find-charset-region which is slooow in XEmacs.
+ find-charset-string which is slooow in XEmacs.
2003-03-18 Katsumi Yamaoka <yamaoka@jpl.org>
2003-03-18 Katsumi Yamaoka <yamaoka@jpl.org>
"PGP ID of your default identity.")
(defun pgg-pgp-process-region (start end passphrase program args)
"PGP ID of your default identity.")
(defun pgg-pgp-process-region (start end passphrase program args)
- (let* ((errors-file-name
- (expand-file-name (make-temp-name "pgg-errors")
- pgg-temporary-file-directory))
+ (let* ((errors-file-name (pgg-make-temp-file "pgg-errors"))
(args
(append args
pgg-pgp-extra-args
(args
(append args
pgg-pgp-extra-args
(defun pgg-pgp-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
(defun pgg-pgp-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
- (let* ((basename (expand-file-name "pgg" temporary-file-directory))
- (orig-file (make-temp-name basename))
- (args '("+verbose=1" "+batchmode" "+language=us"))
- (orig-mode (default-file-modes)))
+ (let ((orig-file (pgg-make-temp-file "pgg"))
+ (args '("+verbose=1" "+batchmode" "+language=us"))
+ (orig-mode (default-file-modes)))
(unwind-protect
(progn
(set-default-file-modes 448)
(unwind-protect
(progn
(set-default-file-modes 448)
(defun pgg-pgp-snarf-keys-region (start end)
"Add all public keys in region between START and END to the keyring."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(defun pgg-pgp-snarf-keys-region (start end)
"Add all public keys in region between START and END to the keyring."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
- (basename (expand-file-name "pgg" temporary-file-directory))
- (key-file (make-temp-name basename))
+ (key-file (pgg-make-temp-file "pgg"))
(args
(list "+verbose=1" "+batchmode" "+language=us" "-kaf"
key-file)))
(args
(list "+verbose=1" "+batchmode" "+language=us" "-kaf"
key-file)))
"PGP 5.* ID of your default identity.")
(defun pgg-pgp5-process-region (start end passphrase program args)
"PGP 5.* ID of your default identity.")
(defun pgg-pgp5-process-region (start end passphrase program args)
- (let* ((errors-file-name
- (expand-file-name (make-temp-name "pgg-errors")
- pgg-temporary-file-directory))
+ (let* ((errors-file-name (pgg-make-temp-file "pgg-errors"))
(args
(append args
pgg-pgp5-extra-args
(args
(append args
pgg-pgp5-extra-args
(defun pgg-pgp5-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
(defun pgg-pgp5-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
- (let* ((basename (expand-file-name "pgg" pgg-temporary-file-directory))
- (orig-file (make-temp-name basename))
+ (let ((orig-file (pgg-make-temp-file "pgg"))
(args '("+verbose=1" "+batchmode=1" "+language=us"))
(orig-mode (default-file-modes)))
(unwind-protect
(args '("+verbose=1" "+batchmode=1" "+language=us"))
(orig-mode (default-file-modes)))
(unwind-protect
(defun pgg-pgp5-snarf-keys-region (start end)
"Add all public keys in region between START and END to the keyring."
(let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
(defun pgg-pgp5-snarf-keys-region (start end)
"Add all public keys in region between START and END to the keyring."
(let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
- (basename (expand-file-name "pgg" pgg-temporary-file-directory))
- (key-file (make-temp-name basename))
+ (key-file (pgg-make-temp-file "pgg"))
(args
(list "+verbose=1" "+batchmode=1" "+language=us" "-a"
key-file)))
(args
(list "+verbose=1" "+batchmode=1" "+language=us" "-a"
key-file)))
(require 'w3)
(require 'url)))
(require 'w3)
(require 'url)))
-(defvar pgg-temporary-file-directory
- (cond ((fboundp 'temp-directory) (temp-directory))
- ((boundp 'temporary-file-directory) temporary-file-directory)
- ("/tmp/")))
-
;;; @ utility functions
;;;
;;; @ utility functions
;;;
`(with-current-buffer pgg-output-buffer
(if (zerop (buffer-size)) nil ,@body t)))
`(with-current-buffer pgg-output-buffer
(if (zerop (buffer-size)) nil ,@body t)))
+(defalias 'pgg-make-temp-file
+ (if (fboundp 'make-temp-file)
+ 'make-temp-file
+ (lambda (prefix &optional dir-flag)
+ (let ((file (expand-file-name
+ (make-temp-name prefix)
+ (if (fboundp 'temp-directory)
+ (temp-directory)
+ temporary-file-directory))))
+ (if dir-flag
+ (make-directory file))
+ file))))
+
;;; @ interface functions
;;;
;;; @ interface functions
;;;