Changeset 1cc4a09 in mainline for uspace/lib/posix

Timestamp:

2011-08-14T00:19:31Z (15 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.

Location:

uspace/lib/posix

Files:

• signal.c (modified) (2 diffs)
• stdio.c (modified) (5 diffs)
• stdio.h (modified) (2 diffs)
• stdlib.c (modified) (2 diffs)
• stdlib.h (modified) (2 diffs)
• sys/wait.c (modified) (2 diffs)
• unistd.c (modified) (5 diffs)
• unistd.h (modified) (1 diff)

uspace/lib/posix/signal.c

@@ -252 +252 @@
                     " or fully unsupported signal. This handler may only be"
                     " invoked by the raise() function, which may not be what"
-                    " the application developer intended.\nSignal name");
+                    " the application developer intended");
         }
 
@@ -360 +360 @@
         }
 
+        if (signo > _TOP_SIGNAL) {
+                errno = EINVAL;
+                return -1;
+        }
+
         if (pid == (posix_pid_t) task_get_id()) {
                 return posix_raise(signo);
-        }
-
-        if (pid > _TOP_SIGNAL) {
-                errno = EINVAL;
-                return -1;
         }
 

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+");
 }
 

uspace/lib/posix/stdio.h

@@ -123 +123 @@
 #define L_tmpnam PATH_MAX
 extern char *posix_tmpnam(char *s);
+extern char *posix_tempnam(const char *dir, const char *pfx);
+extern FILE *posix_tmpfile(void);
 
 #ifndef LIBPOSIX_INTERNAL
+        /* DEBUG macro does not belong to POSIX stdio.h. Its unconditional
+         * definition in the native stdio.h causes unexpected behaviour of
+         * applications which uses their own DEBUG macro (e.g. debugging
+         * output is printed even if not desirable). */
+        #undef DEBUG
+
         #define ctermid posix_ctermid
 
@@ -176 +184 @@
 
         #define tmpnam posix_tmpnam
+        #define tempnam posix_tempnam
+        #define tmpfile posix_tmpfile
 #endif
 

uspace/lib/posix/stdlib.c

@@ -40 +40 @@
 
 #include "errno.h"
+#include "fcntl.h"
 #include "limits.h"
+#include "string.h"
+#include "sys/stat.h"
+#include "unistd.h"
 
 #include "libc/sort.h"
@@ -385 +389 @@
 
 /**
- * 
- * @param tmpl
- * @return
+ * Creates and opens an unique temporary file from template.
+ *
+ * @param tmpl Template. Last six characters must be XXXXXX.
+ * @return The opened file descriptor or -1 on error.
+ */
+int posix_mkstemp(char *tmpl)
+{
+        int fd = -1;
+        
+        char *tptr = tmpl + posix_strlen(tmpl) - 6;
+        
+        while (fd < 0) {
+                if (*posix_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;
+}
+
+/**
+ * Creates an unique temporary file name from template.
+ *
+ * @param tmpl Template. Last six characters must be XXXXXX.
+ * @return The value of tmpl. The template is modified in place.
+ *    If no temporary file name can be created, template is
+ *    reduced to an empty string.
  */
 char *posix_mktemp(char *tmpl)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        int tmpl_len = posix_strlen(tmpl);
+        if (tmpl_len < 6) {
+                errno = EINVAL;
+                *tmpl = '\0';
+                return tmpl;
+        }
+        
+        char *tptr = tmpl + tmpl_len - 6;
+        if (posix_strcmp(tptr, "XXXXXX") != 0) {
+                errno = EINVAL;
+                *tmpl = '\0';
+                return tmpl;
+        }
+        
+        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 (posix_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;
+        }
+        
+        return tmpl;
 }
 

uspace/lib/posix/stdlib.h

@@ -113 +113 @@
 extern void posix_free(void *ptr);
 
+/* Temporary Files */
+extern int posix_mkstemp(char *tmpl);
+
 /* Legacy Declarations */
 extern char *posix_mktemp(char *tmpl);
@@ -158 +161 @@
         #define free posix_free
 
+        #define mkstemp posix_mkstemp
+
         #define mktemp posix_mktemp
         #define getloadavg bsd_getloadavg

uspace/lib/posix/sys/wait.c

@@ -67 +67 @@
 
 /**
+ * Wait for any child process to stop or terminate.
  * 
- * @param stat_ptr
- * @return
+ * @param stat_ptr Location of the final status code of the child process.
+ * @return ID of the child process for which status is reported,
+ *     -1 on signal interrupt, (pid_t)-1 otherwise.
  */
 posix_pid_t posix_wait(int *stat_ptr)
@@ -79 +81 @@
 
 /**
+ * Wait for a child process to stop or terminate.
  * 
- * @param pid
- * @param stat_ptr
- * @param options
- * @return
+ * @param pid What child process shall the caller wait for. See POSIX manual
+ *     for details.
+ * @param stat_ptr Location of the final status code of the child process.
+ * @param options Constraints of the waiting. See POSIX manual for details.
+ * @return ID of the child process for which status is reported,
+ *     -1 on signal interrupt, 0 if non-blocking wait is requested but there is
+ *     no child process whose status can be reported, (pid_t)-1 otherwise.
  */
 posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options)

uspace/lib/posix/unistd.c

@@ -186 +186 @@
  * Close a file.
  *
- * @param fildes
+ * @param fildes File descriptor of the opened file.
  * @return 0 on success, -1 on error.
  */
@@ -223 +223 @@
  * Requests outstanding data to be written to the underlying storage device.
  *
- * @param fildes
+ * @param fildes File descriptor of the opened file.
+ * @return Zero on success, -1 otherwise.
  */
 int posix_fsync(int fildes)
@@ -230 +231 @@
 }
 
+/**
+ * Truncate a file to a specified length.
+ *
+ * @param fildes File descriptor of the opened file.
+ * @param length New length of the file.
+ * @return Zero on success, -1 otherwise.
+ */
 int posix_ftruncate(int fildes, posix_off_t length)
 {
@@ -257 +265 @@
 }
 
+/**
+ * Duplicate an open file descriptor.
+ *
+ * @param fildes File descriptor to be duplicated.
+ * @return On success, new file descriptor for the same file, otherwise -1.
+ */
 int posix_dup(int fildes)
 {
@@ -262 +276 @@
 }
 
+/**
+ * Duplicate an open file descriptor.
+ * 
+ * @param fildes File descriptor to be duplicated.
+ * @param fildes2 File descriptor to be paired with the same file description
+ *     as is paired fildes.
+ * @return fildes2 on success, -1 otherwise.
+ */
 int posix_dup2(int fildes, int fildes2)
 {

uspace/lib/posix/unistd.h

@@ -72 +72 @@
 /* File Manipulation */
 extern int posix_close(int fildes);
-
 extern ssize_t posix_read(int fildes, void *buf, size_t nbyte);
 extern ssize_t posix_write(int fildes, const void *buf, size_t nbyte);
-
 extern int posix_fsync(int fildes);
 extern int posix_ftruncate(int fildes, posix_off_t length);
-
 extern int posix_rmdir(const char *path);
 extern int posix_unlink(const char *path);
-
 extern int posix_dup(int fildes);
 extern int posix_dup2(int fildes, int fildes2);