Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / cups / tempfile.c

diff --git a/cups/tempfile.c b/cups/tempfile.c
index 664b915f8db59c58f7879bef196236b8ac697816..1503b4f7da9d1a7bbd23fddfdeb9d4bef46c4b29 100644 (file)
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -118,8 +118,8 @@ cupsTempFd(char *filename,          /* I - Pointer to buffer */
     * Format a string using the hex time values...
     */
 
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
+    snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(),
+             (unsigned)(curtime.tv_sec + curtime.tv_usec + tries));
 #endif /* WIN32 */
 
    /*