X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=330e7c46926c58c809d3bb1d6de8d2b1b20a02ba;hb=b1d05ceee17137266c8a4729bb0180fe265baae4;hp=60af26d2eb1b3a1a1816a8c512c31d38b41b3c41;hpb=bf351aa129cd4460fb2fd9cb9c4029a38a1f6e8d;p=elisp%2Fepg.git

diff --git a/epg.el b/epg.el
index 60af26d..330e7c4 100644
--- a/epg.el
+++ b/epg.el
@@ -260,7 +260,8 @@ This function is for internal use only."
 
 (defun epg-read-output (context)
   (with-temp-buffer
-    (set-buffer-multibyte nil)
+    (if (fboundp 'set-buffer-multibyte)
+	(set-buffer-multibyte nil))
     (if (file-exists-p (epg-context-output-file context))
 	(let ((coding-system-for-read (if (epg-context-textmode context)
 					  'raw-text
@@ -522,7 +523,54 @@ This function is for internal use only."
       (setq alist (cdr alist)))
     (nreverse result)))
 
-(defalias 'epg-make-temp-file 'make-temp-file)
+(if (fboundp 'make-temp-file)
+    (defalias 'epg-make-temp-file 'make-temp-file)
+  ;; stolen from poe.el.
+  (defun epg-make-temp-file (prefix)
+    "Create a temporary file.
+The returned file name (created by appending some random characters at the end
+of PREFIX, and expanding against `temporary-file-directory' if necessary),
+is guaranteed to point to a newly created empty file.
+You can then use `write-region' to write new data into the file."
+    (let (tempdir tempfile)
+      (unwind-protect
+	  (let (file)
+	    ;; First, create a temporary directory.
+	    (while (condition-case ()
+		       (progn
+			 (setq tempdir (make-temp-name
+					(concat
+					 (file-name-directory prefix)
+					 "DIR")))
+			 ;; return nil or signal an error.
+			 (make-directory tempdir))
+		     ;; let's try again.
+		     (file-already-exists t)))
+	    (set-file-modes tempdir 448)
+	    ;; Second, create a temporary file in the tempdir.
+	    ;; There *is* a race condition between `make-temp-name'
+	    ;; and `write-region', but we don't care it since we are
+	    ;; in a private directory now.
+	    (setq tempfile (make-temp-name (concat tempdir "/EMU")))
+	    (write-region "" nil tempfile nil 'silent)
+	    (set-file-modes tempfile 384)
+	    ;; Finally, make a hard-link from the tempfile.
+	    (while (condition-case ()
+		       (progn
+			 (setq file (make-temp-name prefix))
+			 ;; return nil or signal an error.
+			 (add-name-to-file tempfile file))
+		     ;; let's try again.
+		     (file-already-exists t)))
+	    file)
+	;; Cleanup the tempfile.
+	(and tempfile
+	     (file-exists-p tempfile)
+	     (delete-file tempfile))
+	;; Cleanup the tempdir.
+	(and tempdir
+	     (file-directory-p tempdir)
+	     (delete-directory tempdir))))))
 
 ;;;###autoload
 (defun epg-decrypt-start (context input-file)
@@ -548,9 +596,7 @@ If you are unsure, use synchronous version of this function
 	(if (epg-context-result-for context 'error)
 	    (error "Decryption failed"))
 	(epg-read-output context))
-    (epg-reset context)
-    (if (file-exists-p input-file)
-	(delete-file input-file))))
+    (epg-reset context)))
 
 ;;;###autoload
 (defun epg-decrypt-string (context string)