Changeset 4e6a610 in mainline for uspace/lib/posix/src/stdlib.c

Timestamp:

2018-06-25T09:54:28Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bfe90b6

Parents:

fb0ec570

git-author:

Jiri Svoboda <jiri@…> (2018-06-24 17:51:54)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-25 09:54:28)

Message:

Temporary file functions rework. Fix libposix access() not working on directories.

File:

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

uspace/lib/posix/src/stdlib.c

@@ -38 +38 @@
 
 #include <errno.h>
+#include <tmpfile.h>
 
 #include "posix/fcntl.h"
@@ -163 +164 @@
 int mkstemp(char *tmpl)
 {
-        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;
+        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;
 }
 
@@ -194 +198 @@
 char *mktemp(char *tmpl)
 {
-        int tmpl_len = strlen(tmpl);
+        int tmpl_len;
+        int rc;
+
+        tmpl_len = strlen(tmpl);
         if (tmpl_len < 6) {
                 errno = EINVAL;
@@ -208 +215 @@
         }
 
-        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;
+        rc = __tmpfile_templ(tmpl, false);
+        if (rc != 0) {
+                errno = EIO; // XXX could be more specific
                 *tmpl = '\0';
                 return tmpl;