X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftemp%2Fmkostemps.c;h=ef24eeae2ce9263ec4f328ebf34ef346da297ea9;hb=eb2e298cdc814493a6ced8c05cf0d0f5cccc8b63;hp=d87d4b667b752b75a0908ac3280f3065ae0f7d7b;hpb=8d2f8064aa3d2cc7380c447dfbd8929543f36f51;p=musl

diff --git a/src/temp/mkostemps.c b/src/temp/mkostemps.c
index d87d4b66..ef24eeae 100644
--- a/src/temp/mkostemps.c
+++ b/src/temp/mkostemps.c
@@ -1,27 +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)
 {
 	size_t l = strlen(template);
-	if (l<6 || len>l-6 || strncmp(template+l-len-6, "XXXXXX", 6)) {
+	if (l<6 || len>l-6 || memcmp(template+l-len-6, "XXXXXX", 6)) {
 		errno = EINVAL;
 		return -1;
 	}
 
+	flags -= flags & O_ACCMODE;
 	int fd, retries = 100;
-	while (retries--) {
+	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;
 }