wdvi

commit 6bce486e85d768795cbe770ab035eeb6215ba829
parent 91aa80f596c89134bfd0dd8ccf2ee4d48f62ce2d
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Thu, 19 Aug 2021 18:32:45 +0000

assume we have mkstemp()

Diffstat:
M
util.c
 | 
32
--------------------------------

1 file changed, 0 insertions(+), 32 deletions(-)
diff --git a/util.c b/util.c
@@ -765,12 +765,6 @@ xdvi_temp_fd(str)
 	char			*p;
 	size_t			len;
 	static	const char	*template	= NULL;
-#if !HAVE_MKSTEMP
-	static	unsigned long	seed;
-	static	char		letters[]	=
-	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._";
-	char			*p1;
-#endif
 
 	if (*str != NULL) {
 	    p = *str;
@@ -784,9 +778,7 @@ xdvi_temp_fd(str)
 	    }
 	    if (!(fd == -1 && errno == EEXIST))
 		return fd;
-#if HAVE_MKSTEMP
 	    memcpy(p + strlen(p) - 6, "XXXXXX", 6);
-#endif
 	}
 	else {
 	    if (template == NULL) {
@@ -803,16 +795,12 @@ xdvi_temp_fd(str)
 		template = p = xmalloc(len + sizeof tmp_suffix);
 		memcpy(p, ourdir, len);
 		memcpy(p + len, tmp_suffix, sizeof tmp_suffix);
-#if !HAVE_MKSTEMP
-		seed = 123456789 * time(NULL) + 987654321 * getpid();
-#endif
 	    }
 	    *str = p = xstrdup(template);
 	}
 
 	if (n_files_left == 0) close_a_file();
 
-#if HAVE_MKSTEMP
 	fd = mkstemp(p);
 	if (fd == -1 && (errno == EMFILE || errno == ENFILE)) {
 	    n_files_left = 0;
@@ -820,26 +808,6 @@ xdvi_temp_fd(str)
 	    memcpy(p + strlen(p) - 6, "XXXXXX", 6);
 	    fd = mkstemp(p);
 	}
-#else
-	p1 = p + strlen(p) - 6;
-	for (;;) {
-	    unsigned long s = ++seed;
-	    char *p2;
-
-	    for (p2 = p1 + 5; p2 >= p1; --p2) {
-		*p2 = letters[s & 63];
-		s >>= 6;
-	    }
-	    fd = open(p, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	    if (fd == -1 && (errno == EMFILE || errno == ENFILE)) {
-		n_files_left = 0;
-		close_a_file();
-		fd = open(p, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	    }
-	    if (!(fd == -1 && errno == EEXIST))
-		break;
-	}
-#endif
 
 	return fd;
 }