Changeset 1cc4a09 in mainline for uspace/lib/posix/stdio.c

Timestamp:

2011-08-14T00:19:31Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

b705ecc

Parents:

6d100fd (diff), e0e922d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

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

uspace/lib/posix/stdio.c

@@ -44 +44 @@
 #include "assert.h"
 #include "errno.h"
+#include "stdlib.h"
 #include "string.h"
 #include "sys/types.h"
+#include "unistd.h"
 
 #include "libc/io/printf_core.h"
@@ -255 +257 @@
         assert(stream != NULL);
         
-        /* Retieve the node. */
+        /* Retrieve the node. */
         struct stat st;
         int rc;
@@ -263 +265 @@
         } else {
                 rc = stat(filename, &st);
+                if (-rc == ENOENT) {
+                        /* file does not exist, create new file */
+                        FILE* tmp = fopen(filename, mode);
+                        if (tmp != NULL) {
+                                fclose(tmp);
+                                /* try again */
+                                rc = stat(filename, &st);
+                        }
+                }
         }
         
@@ -724 +735 @@
  * Rename a file or directory.
  *
- * @param old
- * @param new
+ * @param old Old pathname.
+ * @param new New pathname.
  * @return Zero on success, -1 (with errno set) otherwise.
  */
@@ -734 +745 @@
 
 /**
- * 
- * @param s
- * @return
+ * Get a unique temporary file name (obsolete).
+ *
+ * @param s Buffer for the file name. Must be at least L_tmpnam bytes long.
+ * @return The value of s on success, NULL on failure.
  */
 char *posix_tmpnam(char *s)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        assert(L_tmpnam >= posix_strlen("/tmp/tnXXXXXX"));
+        
+        static char buffer[L_tmpnam + 1];
+        if (s == NULL) {
+                s = buffer;
+        }
+        
+        posix_strcpy(s, "/tmp/tnXXXXXX");
+        posix_mktemp(s);
+        
+        if (*s == '\0') {
+                /* Errno set by mktemp(). */
+                return NULL;
+        }
+        
+        return s;
+}
+
+/**
+ * Get an unique temporary file name with additional constraints (obsolete).
+ *
+ * @param dir Path to directory, where the file should be created.
+ * @param pfx Optional prefix up to 5 characters long.
+ * @return Newly allocated unique path for temporary file. NULL on failure.
+ */
+char *posix_tempnam(const char *dir, const char *pfx)
+{
+        /* Sequence number of the filename. */
+        static int seq = 0;
+        
+        size_t dir_len = posix_strlen(dir);
+        if (dir[dir_len - 1] == '/') {
+                dir_len--;
+        }
+        
+        size_t pfx_len = posix_strlen(pfx);
+        if (pfx_len > 5) {
+                pfx_len = 5;
+        }
+        
+        char *result = malloc(dir_len + /* slash*/ 1 +
+            pfx_len + /* three-digit seq */ 3 + /* .tmp */ 4 + /* nul */ 1);
+        
+        if (result == NULL) {
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        char *res_ptr = result;
+        posix_strncpy(res_ptr, dir, dir_len);
+        res_ptr += dir_len;
+        posix_strncpy(res_ptr, pfx, pfx_len);
+        res_ptr += pfx_len;
+        
+        for (; seq < 1000; ++seq) {
+                snprintf(res_ptr, 8, "%03d.tmp", seq);
+                
+                int orig_errno = errno;
+                errno = 0;
+                /* Check if the file exists. */
+                if (posix_access(result, F_OK) == -1) {
+                        if (errno == ENOENT) {
+                                errno = orig_errno;
+                                break;
+                        } else {
+                                /* errno set by access() */
+                                return NULL;
+                        }
+                }
+        }
+        
+        if (seq == 1000) {
+                free(result);
+                errno = EINVAL;
+                return NULL;
+        }
+        
+        return result;
+}
+
+/**
+ * Create and open an unique temporary file.
+ * The file is automatically removed when the stream is closed.
+ *
+ * @param dir Path to directory, where the file should be created.
+ * @param pfx Optional prefix up to 5 characters long.
+ * @return Newly allocated unique path for temporary file. NULL on failure.
+ */
+FILE *posix_tmpfile(void)
+{
+        char filename[] = "/tmp/tfXXXXXX";
+        int fd = posix_mkstemp(filename);
+        if (fd == -1) {
+                /* errno set by mkstemp(). */
+                return NULL;
+        }
+        
+        /* Unlink the created file, so that it's removed on close(). */
+        posix_unlink(filename);
+        return fdopen(fd, "w+");
 }