diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-02-14 19:18:06 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-02-14 19:18:06 -0500 |
| commit | 5377715ce07269131f011e6f4e978fb5dbf0b294 (patch) | |
| tree | d8d22ad01abb34db4296910ef00667054b7cbe1f | |
| parent | c255e5542df8733d6a7227730120bb0c281019b0 (diff) | |
| download | musl-5377715ce07269131f011e6f4e978fb5dbf0b294.tar.gz musl-5377715ce07269131f011e6f4e978fb5dbf0b294.tar.xz musl-5377715ce07269131f011e6f4e978fb5dbf0b294.zip | |
ensure standard functions mk[sd]temp don't depend on removed function mktemp
| -rw-r--r-- | src/temp/mkdtemp.c | 5 | ||||
| -rw-r--r-- | src/temp/mkstemp.c | 5 | ||||
| -rw-r--r-- | src/temp/mktemp.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/temp/mkdtemp.c b/src/temp/mkdtemp.c index cb030ee4..162d98b0 100644 --- a/src/temp/mkdtemp.c +++ b/src/temp/mkdtemp.c @@ -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 diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c index 32c6be57..5e8bb934 100644 --- a/src/temp/mkstemp.c +++ b/src/temp/mkstemp.c @@ -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) { diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c index 8638e087..1078b9df 100644 --- a/src/temp/mktemp.c +++ b/src/temp/mktemp.c @@ -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); |