X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftemp%2Fmkostemps.c;h=ef24eeae2ce9263ec4f328ebf34ef346da297ea9;hb=233bb6972d84e9cb908ff038f78d97e487082225;hp=804a5475d2787e34402ada30739cfb4d5c776cb9;hpb=2cc63358cdb0309ca996ffe56ccf402c2f2f16d5;p=musl

diff --git a/src/temp/mkostemps.c b/src/temp/mkostemps.c
index 804a5475..ef24eeae 100644
--- a/src/temp/mkostemps.c
+++ b/src/temp/mkostemps.c
@@ -1,30 +1,27 @@
 #define _BSD_SOURCE
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include "libc.h"
-
-char *__randname(char *);
 
 int __mkostemps(char *template, int len, int flags)
 {
-	if (len < 0) return EINVAL;
-
-	size_t l = strlen(template)-len;
-	if (l < 6 || strncmp(template+l-6, "XXXXXX", 6)) {
+	size_t l = strlen(template);
+	if (l<6 || len>l-6 || memcmp(template+l-len-6, "XXXXXX", 6)) {
 		errno = EINVAL;
-		*template = 0;
 		return -1;
 	}
 
+	flags -= flags & O_ACCMODE;
 	int fd, retries = 100;
-	while (retries--) {
-		__randname(template+l-6);
+	do {
+		__randname(template+l-len-6);
 		if ((fd = open(template, flags | O_RDWR | O_CREAT | O_EXCL, 0600))>=0)
 			return fd;
-		if (errno != EEXIST) return -1;
-	}
+	} while (--retries && errno == EEXIST);
+
+	memcpy(template+l-len-6, "XXXXXX", 6);
 	return -1;
 }