X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftemp%2Fmkdtemp.c;h=5708257bfecf6ae3e05a5e9fdd0e7054a96d0a7c;hb=0fbd7d6683d04dcaa636df53e7fce69ece746241;hp=f2ecc5102ed996a92bf2da6bfdaf1bcf9899fc47;hpb=446b4207cc7a30d8a4d5b2445a5a1b27d440f55d;p=musl diff --git a/src/temp/mkdtemp.c b/src/temp/mkdtemp.c index f2ecc510..5708257b 100644 --- a/src/temp/mkdtemp.c +++ b/src/temp/mkdtemp.c @@ -1,25 +1,23 @@ #include -#include #include -#include -#include -#include #include #include -#include "libc.h" - -char *__mktemp(char *); char *mkdtemp(char *template) { + size_t l = strlen(template); int retries = 100; - while (retries--) { - if (!__mktemp(template)) return 0; - if (!mkdir(template, 0700)) return template; - if (errno != EEXIST) return 0; - /* this is safe because mktemp verified - * that we have a valid template string */ - strcpy(template+strlen(template)-6, "XXXXXX"); + + if (l<6 || memcmp(template+l-6, "XXXXXX", 6)) { + errno = EINVAL; + return 0; } + + do { + __randname(template+l-6); + if (!mkdir(template, 0700)) return template; + } while (--retries && errno == EEXIST); + + memcpy(template+l-6, "XXXXXX", 6); return 0; }