ensure standard functions mk[sd]temp don't depend on removed function mktemp

diff --git a/src/temp/mkdtemp.c b/src/temp/mkdtemp.c
index cb030ee4de074938b58c1e231ef97993341557e3..162d98b0e38b1cfd760e80c7736f97fce1e0c03d 100644 (file)
--- 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 32c6be5778f84bcc64ad843c6d4299445dd257ae..5e8bb93426e1d5e0d3f1e1deec2b16d364a329af 100644 (file)
--- 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 8638e087091395eaf0dcdde1e669fe91e19c5eb9..1078b9df805e433ebd2d0f4fbe2ab87553e80df9 100644 (file)
--- 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);