cvsdist 67cda08
--- a2ps-4.13/lib/routines.c.security	Sat Oct 16 05:46:37 1999
cvsdist 67cda08
+++ a2ps-4.13/lib/routines.c	Mon Feb 12 17:45:15 2001
cvsdist 67cda08
@@ -242,3 +242,50 @@
cvsdist 67cda08
   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
cvsdist 67cda08
   unlink (filename);
cvsdist 67cda08
 }
cvsdist 67cda08
+
cvsdist 67cda08
+/*
cvsdist 67cda08
+ * Securely generate a temp file, and make sure it gets
cvsdist 67cda08
+ * deleted upon exit.
cvsdist 67cda08
+ */
cvsdist 67cda08
+static char **	tempfiles;
cvsdist 67cda08
+static unsigned	ntempfiles;
cvsdist 67cda08
+
cvsdist 67cda08
+static void
cvsdist 67cda08
+cleanup_tempfiles()
cvsdist 67cda08
+{
cvsdist 67cda08
+	while (ntempfiles--)
cvsdist 67cda08
+		unlink(tempfiles[ntempfiles]);
cvsdist 67cda08
+}
cvsdist 67cda08
+
cvsdist 67cda08
+char *
cvsdist 67cda08
+safe_tempnam(const char *pfx)
cvsdist 67cda08
+{
cvsdist 67cda08
+	char	*dirname, *filename;
cvsdist 67cda08
+	int	fd;
cvsdist 67cda08
+
cvsdist 67cda08
+	if (!(dirname = getenv("TMPDIR")))
cvsdist 67cda08
+		dirname = "/tmp";
cvsdist 67cda08
+
cvsdist 67cda08
+	tempfiles = (char **) realloc(tempfiles,
cvsdist 67cda08
+			(ntempfiles+1) * sizeof(char *));
cvsdist 67cda08
+	if (tempfiles == NULL)
cvsdist 67cda08
+		return NULL;
cvsdist 67cda08
+
cvsdist 67cda08
+	filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
cvsdist 67cda08
+	if (!filename)
cvsdist 67cda08
+		return NULL;
cvsdist 67cda08
+
cvsdist 67cda08
+	sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
cvsdist 67cda08
+
cvsdist 67cda08
+	if ((fd = mkstemp(filename)) < 0) {
cvsdist 67cda08
+		free(filename);
cvsdist 67cda08
+		return NULL;
cvsdist 67cda08
+	}
cvsdist 67cda08
+	close(fd);
cvsdist 67cda08
+
cvsdist 67cda08
+	if (ntempfiles == 0)
cvsdist 67cda08
+		atexit(cleanup_tempfiles);
cvsdist 67cda08
+	tempfiles[ntempfiles++] = filename;
cvsdist 67cda08
+
cvsdist 67cda08
+	return filename;
cvsdist 67cda08
+}
cvsdist 67cda08
--- a2ps-4.13/lib/routines.h.security	Mon Oct 18 21:24:41 1999
cvsdist 67cda08
+++ a2ps-4.13/lib/routines.h	Mon Feb 12 17:39:30 2001
cvsdist 67cda08
@@ -255,7 +255,8 @@
cvsdist 67cda08
 /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
cvsdist 67cda08
 #define tempname_ensure(Str)				\
cvsdist 67cda08
 do {							\
cvsdist 67cda08
-  (Str) = (Str) ? (Str) : tempnam (NULL, "a2_");	\
cvsdist 67cda08
+  (Str) = (Str) ? (Str) : safe_tempnam("a2_");	\
cvsdist 67cda08
 } while (0)
cvsdist 67cda08
+char * safe_tempnam(const char *);
cvsdist 67cda08
 
cvsdist 67cda08
 #endif