Changes in uspace/lib/posix/src/stdlib.c [4e6a610:75c430e3] in mainline

File:

• uspace/lib/posix/src/stdlib.c (modified) (5 diffs)

uspace/lib/posix/src/stdlib.c

@@ -38 +38 @@
 
 #include <errno.h>
-#include <tmpfile.h>
 
 #include "posix/fcntl.h"
@@ -50 +49 @@
 #include "libc/vfs/vfs.h"
 #include "libc/stats.h"
+
+/**
+ * Integer absolute value.
+ *
+ * @param i Input value.
+ * @return Absolute value of the parameter.
+ */
+int abs(int i)
+{
+        return i < 0 ? -i : i;
+}
+
+/**
+ * Long integer absolute value.
+ *
+ * @param i Input value.
+ * @return Absolute value of the parameter.
+ */
+long labs(long i)
+{
+        return i < 0 ? -i : i;
+}
+
+/**
+ * Long long integer absolute value.
+ *
+ * @param i Input value.
+ * @return Absolute value of the parameter.
+ */
+long long llabs(long long i)
+{
+        return i < 0 ? -i : i;
+}
 
 /**
@@ -164 +196 @@
 int mkstemp(char *tmpl)
 {
-        int tmpl_len;
-        int file;
-
-        tmpl_len = strlen(tmpl);
-        if (tmpl_len < 6) {
-                errno = EINVAL;
-                return -1;
-        }
-
-        char *tptr = tmpl + tmpl_len - 6;
-        if (strcmp(tptr, "XXXXXX") != 0) {
-                errno = EINVAL;
-                return -1;
-        }
-
-        file = __tmpfile_templ(tmpl, true);
-        if (file < 0) {
-                errno = EIO; // XXX could be more specific
-                return -1;
-        }
-
-        return file;
+        int fd = -1;
+
+        char *tptr = tmpl + strlen(tmpl) - 6;
+
+        while (fd < 0) {
+                if (*mktemp(tmpl) == '\0') {
+                        /* Errno set by mktemp(). */
+                        return -1;
+                }
+
+                fd = open(tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+
+                if (fd == -1) {
+                        /* Restore template to it's original state. */
+                        snprintf(tptr, 7, "XXXXXX");
+                }
+        }
+
+        return fd;
 }
 
@@ -198 +227 @@
 char *mktemp(char *tmpl)
 {
-        int tmpl_len;
-        int rc;
-
-        tmpl_len = strlen(tmpl);
+        int tmpl_len = strlen(tmpl);
         if (tmpl_len < 6) {
                 errno = EINVAL;
@@ -215 +241 @@
         }
 
-        rc = __tmpfile_templ(tmpl, false);
-        if (rc != 0) {
-                errno = EIO; // XXX could be more specific
+        static int seq = 0;
+
+        for (; seq < 1000000; ++seq) {
+                snprintf(tptr, 7, "%06d", seq);
+
+                int orig_errno = errno;
+                errno = 0;
+                /* Check if the file exists. */
+                if (access(tmpl, F_OK) == -1) {
+                        if (errno == ENOENT) {
+                                errno = orig_errno;
+                                break;
+                        } else {
+                                /* errno set by access() */
+                                *tmpl = '\0';
+                                return tmpl;
+                        }
+                }
+        }
+
+        if (seq == 10000000) {
+                errno = EEXIST;
                 *tmpl = '\0';
                 return tmpl;