Changes in uspace/lib/posix/src/stdio.c [4e6a610:5a6c28d1] in mainline

File:

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

uspace/lib/posix/src/stdio.c

@@ -2 +2 @@
  * Copyright (c) 2011 Jiri Zarevucky
  * Copyright (c) 2011 Petr Koupy
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +38 @@
 
 #include <assert.h>
+
 #include <errno.h>
-#include <stdbool.h>
-#include <tmpfile.h>
-
-#include "posix/fcntl.h"
+
 #include "posix/stdlib.h"
 #include "posix/string.h"
-#include "posix/sys/stat.h"
 #include "posix/sys/types.h"
 #include "posix/unistd.h"
@@ -173 +169 @@
 
 /**
+ * Write error messages to standard error.
+ *
+ * @param s Error message.
+ */
+void perror(const char *s)
+{
+        if (s == NULL || s[0] == '\0') {
+                fprintf(stderr, "%s\n", strerror(errno));
+        } else {
+                fprintf(stderr, "%s: %s\n", s, strerror(errno));
+        }
+}
+
+/** Restores stream a to position previously saved with fgetpos().
+ *
+ * @param stream Stream to restore
+ * @param pos Position to restore
+ * @return Zero on success, non-zero (with errno set) on failure
+ */
+int fsetpos(FILE *stream, const fpos_t *pos)
+{
+        return fseek64(stream, pos->offset, SEEK_SET);
+}
+
+/** Saves the stream's position for later use by fsetpos().
+ *
+ * @param stream Stream to save
+ * @param pos Place to store the position
+ * @return Zero on success, non-zero (with errno set) on failure
+ */
+int fgetpos(FILE *restrict stream, fpos_t *restrict pos)
+{
+        off64_t ret = ftell64(stream);
+        if (ret != -1) {
+                pos->offset = ret;
+                return 0;
+        } else {
+                return -1;
+        }
+}
+
+/**
  * Reposition a file-position indicator in a stream.
  *
@@ -282 +320 @@
 
 /**
+ * Print formatted output to the string.
+ *
+ * @param s Output string.
+ * @param format Format description.
+ * @return Either the number of printed characters (excluding null byte) or
+ *     negative value on error.
+ */
+int sprintf(char *s, const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = vsprintf(s, format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Print formatted output to the string.
+ *
+ * @param s Output string.
+ * @param format Format description.
+ * @param ap Print arguments.
+ * @return Either the number of printed characters (excluding null byte) or
+ *     negative value on error.
+ */
+int vsprintf(char *s, const char *restrict format, va_list ap)
+{
+        return vsnprintf(s, INT_MAX, format, ap);
+}
+
+/**
  * Acquire file stream for the thread.
  *
@@ -357 +426 @@
 }
 
-/** Determine if directory is an 'appropriate' temporary directory.
- *
- * @param dir Directory path
- * @return @c true iff directory is appropriate.
- */
-static bool is_appropriate_tmpdir(const char *dir)
-{
-        struct stat sbuf;
-
-        /* Must not be NULL */
-        if (dir == NULL)
-                return false;
-
-        /* Must not be empty */
-        if (dir[0] == '\0')
-                return false;
-
-        if (stat(dir, &sbuf) != 0)
-                return false;
-
-        /* Must be a directory */
-        if ((sbuf.st_mode & S_IFMT) != S_IFDIR)
-                return false;
-
-        /* Must be writable */
-        if (access(dir, W_OK) != 0)
-                return false;
-
-        return true;
-}
-
-/** Construct unique file name.
- *
- * Never use this function.
+/**
+ * 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 *tmpnam(char *s)
+{
+        assert(L_tmpnam >= strlen("/tmp/tnXXXXXX"));
+
+        static char buffer[L_tmpnam + 1];
+        if (s == NULL) {
+                s = buffer;
+        }
+
+        strcpy(s, "/tmp/tnXXXXXX");
+        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.
@@ -398 +461 @@
 char *tempnam(const char *dir, const char *pfx)
 {
-        const char *dpref;
-        char *d;
-        char *buf;
-        int rc;
-
-        d = getenv("TMPDIR");
-        if (is_appropriate_tmpdir(d))
-                dpref = d;
-        else if (is_appropriate_tmpdir(dir))
-                dpref = dir;
-        else if (is_appropriate_tmpdir(P_tmpdir))
-                dpref = P_tmpdir;
-        else
-                dpref = "/";
-
-        if (dpref[strlen(dpref) - 1] != '/')
-                rc = asprintf(&buf, "%s/%sXXXXXX", dpref, pfx);
-        else
-                rc = asprintf(&buf, "%s%sXXXXXX", dpref, pfx);
-
-        if (rc < 0)
+        /* Sequence number of the filename. */
+        static int seq = 0;
+
+        size_t dir_len = strlen(dir);
+        if (dir[dir_len - 1] == '/') {
+                dir_len--;
+        }
+
+        size_t pfx_len = 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;
-
-        rc = __tmpfile_templ(buf, false);
-        if (rc != 0) {
-                free(buf);
+        }
+
+        char *res_ptr = result;
+        strncpy(res_ptr, dir, dir_len);
+        res_ptr += dir_len;
+        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 = EOK;
+                /* Check if the file exists. */
+                if (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 buf;
+        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 *tmpfile(void)
+{
+        char filename[] = "/tmp/tfXXXXXX";
+        int fd = mkstemp(filename);
+        if (fd == -1) {
+                /* errno set by mkstemp(). */
+                return NULL;
+        }
+
+        /* Unlink the created file, so that it's removed on close(). */
+        unlink(filename);
+        return fdopen(fd, "w+");
 }