Changeset 4e6a610 in mainline for uspace/lib/c/generic/stdio.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/c/generic/stdio.c (modified) (5 diffs)

uspace/lib/c/generic/stdio.c

@@ -34 +34 @@
 
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <str.h>
 #include <str_error.h>
+#include <tmpfile.h>
 #include <vfs/vfs.h>
+
+/** Static buffer for tmpnam function */
+static char tmpnam_buf[L_tmpnam];
 
 /** Get stream position.
@@ -82 +88 @@
         rc = vfs_rename_path(old_path, new_path);
         if (rc != EOK) {
+                /*
+                 * Note that ISO C leaves the value of errno undefined,
+                 * whereas according to UN*X standards, it is set.
+                 */
                 errno = rc;
                 return -1;
@@ -96 +106 @@
         rc = vfs_unlink_path(path);
         if (rc != EOK) {
+                /*
+                 * Note that ISO C leaves the value of errno undefined,
+                 * whereas according to UN*X standards, it is set.
+                 */
                 errno = rc;
                 return -1;
@@ -101 +115 @@
 
         return 0;
+}
+
+/** Create a temporary file.
+ *
+ * @return Open stream descriptor or @c NULL on error. In that case
+ *         errno is set (UN*X). Note that ISO C leaves the value of errno
+ *         undefined.
+ */
+FILE *tmpfile(void)
+{
+        int file;
+        FILE *stream;
+
+        file = __tmpfile();
+        if (file < 0) {
+                printf("file is < 0\n");
+                errno = EEXIST;
+                return NULL;
+        }
+
+        stream = fdopen(file, "w+");
+        if (stream == NULL) {
+                printf("stream = NULL\n");
+                vfs_put(file);
+                errno = EACCES;
+                return NULL;
+        }
+
+        printf("returning stream\n");
+        return stream;
+}
+
+/** Create name for a temporary file.
+ *
+ * @param s Pointer to array of at least L_tmpnam bytes or @c NULL.
+ * @return The pointer @a s or pointer to internal static buffer on success,
+ *         @c NULL on error.
+ */
+char *tmpnam(char *s)
+{
+        char *p;
+
+        p = (s != NULL) ? s : tmpnam_buf;
+        return __tmpnam(p);
 }
 
@@ -115 +173 @@
 }
 
+
 /** @}
  */