[Emacs-diffs] emacs-24 r117066: * gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name.

[Glenn Morris]

------------------------------------------------------------
revno: 117066
revision-id: address@hidden
parent: address@hidden
fixes bug: http://bugs.debian.org/747100
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-05 20:50:51 -0700
message:
  * gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-fun.el          gnusfun.el-20091113204419-o5vbwnq5f7feedwu-3243

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-05-01 23:55:25 +0000
+++ b/lisp/gnus/ChangeLog       2014-05-06 03:50:51 +0000
@@ -1,3 +1,8 @@
+2014-05-06  Glenn Morris  <address@hidden>
+
+       * gnus-fun.el (gnus-grab-cam-face):
+       Do not use predictable temp-file name.  (http://bugs.debian.org/747100)
+
 2014-05-01  Glenn Morris  <address@hidden>
 
        * gnus-registry.el (gnus-registry-install-p): Doc fix.

=== modified file 'lisp/gnus/gnus-fun.el'
--- a/lisp/gnus/gnus-fun.el     2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/gnus-fun.el     2014-05-06 03:50:51 +0000
@@ -250,20 +250,21 @@
   (interactive)
   (shell-command "xawtv-remote snap ppm")
   (let ((file nil)
+       (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
        result)
     (while (null (setq file (directory-files "/tftpboot/sparky/tmp"
                                             t "snap.*ppm")))
       (sleep-for 1))
     (setq file (car file))
     (shell-command
-     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale 
-width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
-            file))
+     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale 
-width 48 -height 48 | ppmtopgm >> %s"
+            file tempfile))
     (let ((gnus-convert-image-to-face-command
           (format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
                   (gnus-fun-ppm-change-string))))
-      (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
+      (setq result (gnus-face-from-file tempfile)))
     (delete-file file)
-    ;;(delete-file "/tmp/gnus.face.ppm")
+    ;;(delete-file tempfile)    ; FIXME why are we not deleting it?!
     result))
 
 (defun gnus-fun-ppm-change-string ()