mirror of
git://git.musl-libc.org/musl
synced 2024-12-15 11:15:07 +00:00
ensure standard functions mk[sd]temp don't depend on removed function mktemp
This commit is contained in:
parent
c255e5542d
commit
5377715ce0
@ -1,4 +1,3 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -9,10 +8,12 @@
|
||||
#include <sys/stat.h>
|
||||
#include "libc.h"
|
||||
|
||||
char *__mktemp(char *);
|
||||
|
||||
char *mkdtemp(char *template)
|
||||
{
|
||||
for (;;) {
|
||||
if (!mktemp(template)) return 0;
|
||||
if (!__mktemp(template)) return 0;
|
||||
if (!mkdir(template, 0700)) return template;
|
||||
if (errno != EEXIST) return 0;
|
||||
/* this is safe because mktemp verified
|
||||
|
@ -1,4 +1,3 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -8,11 +7,13 @@
|
||||
#include <errno.h>
|
||||
#include "libc.h"
|
||||
|
||||
char *__mktemp(char *);
|
||||
|
||||
int mkstemp(char *template)
|
||||
{
|
||||
int fd;
|
||||
retry:
|
||||
if (!mktemp(template)) return -1;
|
||||
if (!__mktemp(template)) return -1;
|
||||
fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600);
|
||||
if (fd >= 0) return fd;
|
||||
if (errno == EEXIST) {
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <errno.h>
|
||||
#include "libc.h"
|
||||
|
||||
char *mktemp(char *template)
|
||||
char *__mktemp(char *template)
|
||||
{
|
||||
static int lock;
|
||||
static int index;
|
||||
@ -27,3 +27,5 @@ char *mktemp(char *template)
|
||||
UNLOCK(&lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
weak_alias(__mktemp, mktemp);
|
||||
|
Loading…
Reference in New Issue
Block a user