Changes in / [d85a01c:1814ee4d] in mainline

Location:

uspace/lib/posix

Files:

• assert.h (modified) (1 diff)
• ctype.c (modified) (1 diff)
• fnmatch.c (modified) (2 diffs)
• internal/common.h (modified) (1 diff)
• pwd.c (modified) (7 diffs)
• pwd.h (modified) (1 diff)
• signal.c (modified) (2 diffs)
• stdio.c (modified) (3 diffs)
• stdio.h (modified) (2 diffs)
• sys/wait.c (modified) (3 diffs)
• sys/wait.h (modified) (2 diffs)
• unistd.c (modified) (5 diffs)
• unistd.h (modified) (4 diffs)

uspace/lib/posix/assert.h

@@ -40 +40 @@
 
 #ifndef NDEBUG
-        #define assert(expr) \
-                do { \
-                        if (!(expr)) { \
-                                assert_abort(#expr, __FILE__, __LINE__); \
-                        } \
-                } while (0)
+        #define assert(expr) ((expr) ? (void) 0 : assert_abort(#expr, __FILE__, __LINE__))
 #else
         #define assert(expr) ((void) 0)

uspace/lib/posix/ctype.c

@@ -94 +94 @@
 int posix_isprint(int c)
 {
-        return !posix_iscntrl(c);
+        return posix_isascii(c) && !posix_iscntrl(c);
 }
 

uspace/lib/posix/fnmatch.c

@@ -525 +525 @@
 static char *_casefold(const char *s)
 {
+        assert(s != NULL);
         char *result = strdup(s);
         for (char *i = result; *i != '\0'; ++i) {
@@ -542 +543 @@
 int posix_fnmatch(const char *pattern, const char *string, int flags)
 {
+        assert(pattern != NULL);
+        assert(string != NULL);
+
         // TODO: don't fold everything in advance, but only when needed
 

uspace/lib/posix/internal/common.h

@@ -43 +43 @@
     __func__, __FILE__, __LINE__), abort())
 
+/* A little helper macro to avoid typing this over and over. */
+#define errnify(func, ...) ({ \
+        int rc = func(__VA_ARGS__); \
+        if (rc < 0) { \
+                errno = -rc; \
+                rc = -1; \
+        } \
+        rc; \
+})
+
 #endif /* LIBPOSIX_COMMON_H_ */
 

uspace/lib/posix/pwd.c

@@ -39 +39 @@
 #include "errno.h"
 
-// TODO: documentation
-
 static bool entry_read = false;
 
@@ -46 +44 @@
 static const struct posix_passwd dummy_pwd = {
         .pw_name = (char *) "user",
-        .pw_uid = 1,
-        .pw_gid = 1,
+        .pw_uid = 0,
+        .pw_gid = 0,
         .pw_dir = (char *) "/",
         .pw_shell = (char *) "/app/bdsh"
@@ -115 +113 @@
 {
         assert(name != NULL);
+        assert(pwd != NULL);
+        assert(buffer != NULL);
+        assert(result != NULL);
         
         if (posix_strcmp(name, "user") != 0) {
@@ -121 +122 @@
         }
         
-        return posix_getpwuid_r(1, pwd, buffer, bufsize, result);
+        return posix_getpwuid_r(0, pwd, buffer, bufsize, result);
 }
 
@@ -132 +133 @@
 struct posix_passwd *posix_getpwuid(posix_uid_t uid)
 {
-        if (uid != 1) {
+        if (uid != 0) {
                 return NULL;
         }
@@ -159 +160 @@
             '/', '\0', 'b', 'd', 's', 'h', '\0' };
         
-        if (uid != 1) {
+        if (uid != 0) {
                 *result = NULL;
                 return 0;
@@ -171 +172 @@
 
         pwd->pw_name = (char *) bf;
-        pwd->pw_uid = 1;
-        pwd->pw_gid = 1;
+        pwd->pw_uid = 0;
+        pwd->pw_gid = 0;
         pwd->pw_dir = (char *) bf + 5;
         pwd->pw_shell = (char *) bf + 7;

uspace/lib/posix/pwd.h

@@ -35 +35 @@
 #ifndef POSIX_PWD_H_
 #define POSIX_PWD_H_
-
-// TODO: documentation
 
 #include "sys/types.h"

uspace/lib/posix/signal.c

@@ -66 +66 @@
 
 /**
- * 
- * @param signo
+ * Default signal handler. Executes the default action for each signal,
+ * as reasonable within HelenOS.
+ *
+ * @param signo Signal number.
  */
 void __posix_default_signal_handler(int signo)
@@ -75 +77 @@
                 abort();
         case SIGQUIT:
-                fprintf(stderr, "Quit signal raised. Exiting.");
+                fprintf(stderr, "Quit signal raised. Exiting.\n");
                 exit(EXIT_FAILURE);
         case SIGINT:
-                fprintf(stderr, "Interrupt signal caught. Exiting.");
+                fprintf(stderr, "Interrupt signal caught. Exiting.\n");
                 exit(EXIT_FAILURE);
         case SIGTERM:
-                fprintf(stderr, "Termination signal caught. Exiting.");
+                fprintf(stderr, "Termination signal caught. Exiting.\n");
                 exit(EXIT_FAILURE);
         case SIGSTOP:
-                fprintf(stderr, "Stop signal caught, but unsupported. Ignoring.");
+                fprintf(stderr, "Stop signal caught, but unsupported. Ignoring.\n");
                 break;
         case SIGKILL:

uspace/lib/posix/stdio.c

@@ -50 +50 @@
 #include "libc/str.h"
 #include "libc/malloc.h"
+#include "libc/adt/list.h"
+#include "libc/sys/stat.h"
 
 
@@ -252 +254 @@
         assert(mode != NULL);
         assert(stream != NULL);
-
+        
+        /* Retieve the node. */
+        struct stat st;
+        int rc;
+        
         if (filename == NULL) {
-                // TODO
-                
-                /* print error to stderr as well, to avoid hard to find problems
-                 * with buggy apps that expect this to work
-                 */
-                fprintf(stderr,
-                    "ERROR: Application wants to use freopen() to change mode of opened stream.\n"
-                    "       libposix does not support that yet, the application may function improperly.\n");
-                errno = ENOTSUP;
+                rc = fstat(stream->fd, &st);
+        } else {
+                rc = stat(filename, &st);
+        }
+        
+        if (rc != EOK) {
+                fclose(stream);
+                errno = -rc;
                 return NULL;
         }
-
-        FILE* copy = malloc(sizeof(FILE));
-        if (copy == NULL) {
-                errno = ENOMEM;
+        
+        fdi_node_t node = {
+                .fs_handle = st.fs_handle,
+                .devmap_handle = st.devmap_handle,
+                .index = st.index
+        };
+        
+        /* Open a new stream. */
+        FILE* new = fopen_node(&node, mode);
+        if (new == NULL) {
+                fclose(stream);
+                /* fopen_node() sets errno. */
                 return NULL;
         }
-        memcpy(copy, stream, sizeof(FILE));
-        fclose(copy); /* copy is now freed */
-        
-        copy = fopen(filename, mode); /* open new stream */
-        if (copy == NULL) {
-                /* fopen() sets errno */
-                return NULL;
-        }
-        
-        /* move the new stream to the original location */
-        memcpy(stream, copy, sizeof (FILE));
-        free(copy);
-        
-        /* update references in the file list */
+        
+        /* Close the original stream without freeing it (ignoring errors). */
+        if (stream->buf != NULL) {
+                fflush(stream);
+        }
+        if (stream->sess != NULL) {
+                async_hangup(stream->sess);
+        }
+        if (stream->fd >= 0) {
+                close(stream->fd);
+        }
+        list_remove(&stream->link);
+        
+        /* Move the new stream to the original location. */
+        memcpy(stream, new, sizeof (FILE));
+        free(new);
+        
+        /* Update references in the file list. */
         stream->link.next->prev = &stream->link;
         stream->link.prev->next = &stream->link;
@@ -676 +693 @@
 
 /**
- * Remove a file.
+ * Remove a file or directory.
  *
  * @param path Pathname of the file that shall be removed.
- * @return Zero on success, -1 otherwise.
+ * @return Zero on success, -1 (with errno set) otherwise.
  */
 int posix_remove(const char *path)
 {
-        // FIXME: unlink() and rmdir() seem to be equivalent at the moment,
-        //        but that does not have to be true forever
-        return unlink(path);
+        struct stat st;
+        int rc = stat(path, &st);
+        
+        if (rc != EOK) {
+                errno = -rc;
+                return -1;
+        }
+        
+        if (st.is_directory) {
+                rc = rmdir(path);
+        } else {
+                rc = unlink(path);
+        }
+        
+        if (rc != EOK) {
+                errno = -rc;
+                return -1;
+        }
+        return 0;
+}
+
+/**
+ * Rename a file or directory.
+ *
+ * @param old
+ * @param new
+ * @return Zero on success, -1 (with errno set) otherwise.
+ */
+int posix_rename(const char *old, const char *new)
+{
+        return errnify(rename, old, new);
 }
 

uspace/lib/posix/stdio.h

@@ -116 +116 @@
 extern int posix_remove(const char *path);
 
+/* Renaming Files */
+extern int posix_rename(const char *old, const char *new);
+
 /* Temporary Files */
 #undef L_tmpnam
@@ -170 +173 @@
         #define remove posix_remove
 
+        #define rename posix_rename
+
         #define tmpnam posix_tmpnam
 #endif

uspace/lib/posix/sys/wait.c

@@ -39 +39 @@
 #include "wait.h"
 
+#include "../libc/task.h"
+#include "../assert.h"
+#include "../errno.h"
+#include "../limits.h"
+#include "../signal.h"
+
+int __posix_wifexited(int status) {
+        return status != INT_MIN;
+}
+
+int __posix_wexitstatus(int status) {
+        assert(__posix_wifexited(status));
+        return status;
+}
+
+int __posix_wifsignaled(int status) {
+        return status == INT_MIN;
+}
+
+int __posix_wtermsig(int status) {
+        assert(__posix_wifsignaled(status));
+        /* There is no way to distinguish reason
+         * for unexpected termination at the moment.
+         */
+        return SIGABRT;
+}
+
 /**
  * 
@@ -46 +73 @@
 posix_pid_t posix_wait(int *stat_ptr)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        /* HelenOS does not support this. */
+        errno = ENOSYS;
+        return (posix_pid_t) -1;
 }
 
@@ -59 +87 @@
 posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        assert(stat_ptr != NULL);
+        assert(options == 0 /* None of the options are supported. */);
+        
+        task_exit_t texit;
+        int retval;
+        
+        int rc = task_wait((task_id_t) pid, &texit, &retval);
+        
+        if (rc < 0) {
+                /* Unable to retrieve status. */
+                errno = -rc;
+                return (posix_pid_t) -1;
+        }
+        
+        if (texit == TASK_EXIT_NORMAL) {
+                // FIXME: relies on application not returning this value
+                assert(retval != INT_MIN);
+                *stat_ptr = retval;
+        } else {
+                /* Reserve the lowest value for unexpected termination. */
+                *stat_ptr = INT_MIN;
+        }
+        
+        return pid;
 }
 

uspace/lib/posix/sys/wait.h

@@ -38 +38 @@
 #include "types.h"
 
+#undef WIFEXITED
+#undef WEXITSTATUS
+#undef WIFSIGNALED
+#undef WTERMSIG
+#define WIFEXITED(status) __posix_wifexited(status)
+#define WEXITSTATUS(status) __posix_wexitstatus(status)
+#define WIFSIGNALED(status) __posix_wifsignaled(status)
+#define WTERMSIG(status) __posix_wtermsig(status)
+
+extern int __posix_wifexited(int status);
+extern int __posix_wexitstatus(int status);
+extern int __posix_wifsignaled(int status);
+extern int __posix_wtermsig(int status);
+
 extern posix_pid_t posix_wait(int *stat_ptr);
 extern posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options);
@@ -43 +57 @@
 #ifndef LIBPOSIX_INTERNAL
         #define wait posix_wait
-        #define waitpid posix_waitpid
+        #define waitpid posix_waitpid
 #endif
 

uspace/lib/posix/unistd.c

@@ -110 +110 @@
                 return NULL;
         }
+        
+        /* Save the original value to comply with the "no modification on
+         * success" semantics.
+         */
+        int orig_errno = errno;
+        errno = EOK;
+        
         char *ret = getcwd(buf, size);
-        if (ret == NULL && errno == EOK) {
-                errno = ERANGE;
-        }
+        if (ret == NULL) {
+                /* Check errno to avoid shadowing other possible errors. */
+                if (errno == EOK) {
+                        errno = ERANGE;
+                }
+        } else {
+                /* Success, restore previous errno value. */
+                errno = orig_errno;
+        }
+        
         return ret;
+}
+
+/**
+ * Change the current working directory.
+ *
+ * @param path New working directory.
+ */
+int posix_chdir(const char *path)
+{
+        return errnify(chdir, path);
 }
 
@@ -157 +181 @@
         /* There is currently no support for user accounts in HelenOS. */
         return 0;
+}
+
+/**
+ * Close a file.
+ *
+ * @param fildes
+ * @return 0 on success, -1 on error.
+ */
+int posix_close(int fildes)
+{
+        return errnify(close, fildes);
 }
 
@@ -169 +204 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        int rc = read(fildes, buf, nbyte);
-        if (rc < 0) {
-                errno = -rc;
-                return -1;
-        } else {
-                return rc;
-        }
+        return errnify(read, fildes, buf, nbyte);
+}
+
+/**
+ * Write to a file.
+ *
+ * @param fildes File descriptor of the opened file.
+ * @param buf Buffer to write.
+ * @param nbyte Size of the buffer.
+ * @return Number of written bytes on success, -1 otherwise.
+ */
+ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
+{
+        return errnify(write, fildes, buf, nbyte);
+}
+
+/**
+ * Requests outstanding data to be written to the underlying storage device.
+ *
+ * @param fildes
+ */
+int posix_fsync(int fildes)
+{
+        return errnify(fsync, fildes);
+}
+
+int posix_ftruncate(int fildes, posix_off_t length)
+{
+        return errnify(ftruncate, fildes, (aoff64_t) length);
+}
+
+/**
+ * Remove a directory.
+ *
+ * @param path Directory pathname.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_rmdir(const char *path)
+{
+        return errnify(rmdir, path);
 }
 
@@ -186 +254 @@
 int posix_unlink(const char *path)
 {
-        int rc = unlink(path);
-        if (rc < 0) {
-                errno = -rc;
-                return -1;
-        } else {
-                return rc;
-        }
+        return errnify(unlink, path);
+}
+
+int posix_dup(int fildes)
+{
+        return posix_fcntl(fildes, F_DUPFD, 0);
+}
+
+int posix_dup2(int fildes, int fildes2)
+{
+        return errnify(dup2, fildes, fildes2);
 }
 
@@ -204 +276 @@
 int posix_access(const char *path, int amode)
 {
-        if (amode == F_OK) {
-                /* Check file existence by attempt to open it. */
+        if (amode == F_OK || (amode & (X_OK | W_OK | R_OK))) {
+                /* HelenOS doesn't support permissions, permission checks
+                 * are equal to existence check.
+                 *
+                 * Check file existence by attempting to open it.
+                 */
                 int fd = open(path, O_RDONLY);
-                if (fd != -1) {
-                        close(fd);
+                if (fd < 0) {
+                        errno = -fd;
+                        return -1;
                 }
-                return fd;
-        } else if (amode & (X_OK | W_OK | R_OK)) {
-                /* HelenOS doesn't support permissions, return success. */
+                close(fd);
                 return 0;
         } else {

uspace/lib/posix/unistd.h

@@ -60 +60 @@
 /* Working Directory */
 extern char *posix_getcwd(char *buf, size_t size);
+extern int posix_chdir(const char *path);
 
 /* Query Memory Parameters */
@@ -69 +70 @@
 extern posix_gid_t posix_getgid(void);
 
-/* File Input/Output */
+/* 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);
 
-/* Deleting Files */
+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);
 
 /* Standard Streams */
@@ -144 +154 @@
 
         #define getcwd posix_getcwd
+        #define chdir posix_chdir
 
         #define isatty posix_isatty
@@ -154 +165 @@
         #define getgid posix_getgid
 
+        #define close posix_close
         #define read posix_read
-
+        #define write posix_write
+        #define fsync posix_fsync
+        #define ftruncate posix_ftruncate
+        #define rmdir posix_rmdir
         #define unlink posix_unlink
+        #define dup posix_dup
+        #define dup2 posix_dup2
 
         #define access posix_access