Changeset d948095 in mainline for uspace/lib/posix/source

Timestamp:

2012-10-05T08:04:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b60faf7

Parents:

be1dcc26 (diff), 32b3a12 (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 cleaning (lp:~vojtech-horky/helenos/misc)

Sources and headers were separated into different directories.

There are less includes from HelenOS-specific libc into public headers
of libposix. That way, the POSIX namespace is not polluted with HelenOS
specific functions (that may collide with functions declared by
other applications).

Location:

uspace/lib/posix/source

Files:

• ctype.c (moved) (moved from uspace/lib/posix/ctype.c ) (1 diff)
• errno.c (moved) (moved from uspace/lib/posix/errno.c ) (1 diff)
• fcntl.c (moved) (moved from uspace/lib/posix/fcntl.c ) (2 diffs)
• fnmatch.c (moved) (moved from uspace/lib/posix/fnmatch.c ) (6 diffs)
• getopt.c (moved) (moved from uspace/lib/posix/getopt.c ) (1 diff)
• internal/common.h (moved) (moved from uspace/lib/posix/internal/common.h )
• locale.c (moved) (moved from uspace/lib/posix/locale.c ) (1 diff)
• math.c (moved) (moved from uspace/lib/posix/math.c ) (1 diff)
• pwd.c (moved) (moved from uspace/lib/posix/pwd.c ) (1 diff)
• signal.c (moved) (moved from uspace/lib/posix/signal.c ) (1 diff)
• stdio.c (moved) (moved from uspace/lib/posix/stdio.c ) (2 diffs)
• stdio/scanf.c (moved) (moved from uspace/lib/posix/stdio/scanf.c ) (1 diff)
• stdlib.c (moved) (moved from uspace/lib/posix/stdlib.c ) (1 diff)
• stdlib/strtol.c (moved) (moved from uspace/lib/posix/stdlib/strtol.c ) (1 diff)
• stdlib/strtold.c (moved) (moved from uspace/lib/posix/stdlib/strtold.c ) (1 diff)
• string.c (moved) (moved from uspace/lib/posix/string.c ) (1 diff)
• strings.c (moved) (moved from uspace/lib/posix/strings.c ) (1 diff)
• sys/stat.c (moved) (moved from uspace/lib/posix/sys/stat.c ) (1 diff)
• sys/wait.c (moved) (moved from uspace/lib/posix/sys/wait.c ) (1 diff)
• time.c (moved) (moved from uspace/lib/posix/time.c ) (1 diff)
• unistd.c (moved) (moved from uspace/lib/posix/unistd.c ) (1 diff)

uspace/lib/posix/source/ctype.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include "ctype.h"
+#include "posix/ctype.h"
 
 /**

uspace/lib/posix/source/errno.c

@@ -33 +33 @@
  */
 
-#include "errno.h"
+#include "posix/errno.h"
 
-#include "stdlib.h"
+#include "posix/stdlib.h"
 #include "libc/fibril.h"
 

uspace/lib/posix/source/fcntl.c

@@ -36 +36 @@
 
 #include "internal/common.h"
-#include "fcntl.h"
+#include "posix/fcntl.h"
 
 #include "libc/unistd.h"
 #include "libc/vfs/vfs.h"
-#include "errno.h"
+#include "posix/errno.h"
 
 /**
@@ -95 +95 @@
 }
 
+/**
+ * Open, possibly create, a file.
+ *
+ * @param pathname Path to the file.
+ * @param flags Access mode flags.
+ */
+int posix_open(const char *pathname, int flags, ...)
+{
+        mode_t mode = 0;
+        if ((flags & O_CREAT) > 0) {
+                va_list args;
+                va_start(args, flags);
+                mode = va_arg(args, mode_t);
+                va_end(args);
+        }
+
+        int rc = open(pathname, flags, mode);
+        if (rc < 0) {
+                errno = -rc;
+                rc = -1;
+        }
+
+        return rc;
+}
+
 /** @}
  */

uspace/lib/posix/source/fnmatch.c

@@ -42 +42 @@
  */
 
-#include "stdbool.h"
-#include "ctype.h"
-#include "string.h"
-#include "stdlib.h"
-#include "assert.h"
-
 #define LIBPOSIX_INTERNAL
 
+#include "posix/stdbool.h"
+#include "posix/ctype.h"
+#include "posix/string.h"
+#include "posix/stdlib.h"
+#include "posix/assert.h"
+
 #include "internal/common.h"
-#include "fnmatch.h"
+#include "posix/fnmatch.h"
 
 /* Returned by _match... functions. */
@@ -182 +182 @@
         { "alnum", isalnum },
         { "alpha", isalpha },
-        { "blank", isblank },
-        { "cntrl", iscntrl },
+        { "blank", posix_isblank },
+        { "cntrl", posix_iscntrl },
         { "digit", isdigit },
-        { "graph", isgraph },
+        { "graph", posix_isgraph },
         { "lower", islower },
-        { "print", isprint },
-        { "punct", ispunct },
+        { "print", posix_isprint },
+        { "punct", posix_ispunct },
         { "space", isspace },
         { "upper", isupper },
-        { "xdigit", isxdigit }
+        { "xdigit", posix_isxdigit }
 };
 
@@ -204 +204 @@
 {
         const struct _char_class *class = elem;
-        return strcmp((const char *) key, class->name);
+        return posix_strcmp((const char *) key, class->name);
 }
 
@@ -217 +217 @@
 {
         /* Search for class in the array of supported character classes. */
-        const struct _char_class *class = bsearch(cname, _char_classes,
+        const struct _char_class *class = posix_bsearch(cname, _char_classes,
             sizeof(_char_classes) / sizeof(struct _char_class),
             sizeof(struct _char_class), _class_compare);
@@ -549 +549 @@
                         end = string;
                 } else {
-                        end = strchrnul(string, pathname ? '/' : '\0');
+                        end = gnu_strchrnul(string, pathname ? '/' : '\0');
                 }
 
@@ -581 +581 @@
 {
         assert(s != NULL);
-        char *result = strdup(s);
+        char *result = posix_strdup(s);
         for (char *i = result; *i != '\0'; ++i) {
                 *i = tolower(*i);

uspace/lib/posix/source/getopt.c

@@ -36 +36 @@
 #include "internal/common.h"
 #include "libc/getopt.h"
-#include "getopt.h"
+#include "posix/getopt.h"
 
 

uspace/lib/posix/source/locale.c

@@ -36 +36 @@
 
 #include "internal/common.h"
-#include "locale.h"
+#include "posix/locale.h"
 
-#include "errno.h"
-#include "limits.h"
-#include "string.h"
+#include "posix/errno.h"
+#include "posix/limits.h"
+#include "posix/string.h"
 
 /* Just a very basic dummy implementation.

uspace/lib/posix/source/math.c

@@ -36 +36 @@
 
 #include "internal/common.h"
-#include "math.h"
+#include "posix/math.h"
 
 /**

uspace/lib/posix/source/pwd.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-#include "pwd.h"
-#include "string.h"
-#include "errno.h"
-#include "assert.h"
+#include "posix/stdbool.h"
+#include "posix/pwd.h"
+#include "posix/string.h"
+#include "posix/errno.h"
+#include "posix/assert.h"
 
 static bool entry_read = false;

uspace/lib/posix/source/signal.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-#include "signal.h"
+#include "posix/signal.h"
 #include "internal/common.h"
-#include "limits.h"
-#include "stdlib.h"
-#include "string.h"
-#include "errno.h"
+#include "posix/limits.h"
+#include "posix/stdlib.h"
+#include "posix/string.h"
+#include "posix/errno.h"
 
 #include "libc/fibril_synch.h"

uspace/lib/posix/source/stdio.c

@@ -37 +37 @@
 
 /* Has to be first. */
-#include "stdbool.h"
+#include "posix/stdbool.h"
 
 #include "internal/common.h"
-#include "stdio.h"
-
-#include "assert.h"
-#include "errno.h"
-#include "stdlib.h"
-#include "string.h"
-#include "sys/types.h"
-#include "unistd.h"
-
+#include "posix/stdio.h"
+
+#include "posix/assert.h"
+#include "posix/errno.h"
+#include "posix/stdlib.h"
+#include "posix/string.h"
+#include "posix/sys/types.h"
+#include "posix/unistd.h"
+
+#include "libc/stdio.h"
 #include "libc/io/printf_core.h"
 #include "libc/str.h"
@@ -59 +60 @@
  * need to be implemented in libc anyway
  */
-#include "../c/generic/private/stdio.h"
+#include "../../c/generic/private/stdio.h"
 
 /** Clears the stream's error and end-of-file indicators.

uspace/lib/posix/source/stdio/scanf.c

@@ -36 +36 @@
 
 /* Must be first. */
-#include "../stdbool.h"
-
-#include "../assert.h"
-#include "../errno.h"
-
-#include "../stdio.h"
-#include "../stdlib.h"
-#include "../stddef.h"
-#include "../string.h"
-#include "../ctype.h"
-#include "../sys/types.h"
+#include "posix/stdbool.h"
+
+#include "posix/assert.h"
+#include "posix/errno.h"
+
+#include "posix/stdio.h"
+#include "posix/stdlib.h"
+#include "posix/stddef.h"
+#include "posix/string.h"
+#include "posix/ctype.h"
+#include "posix/sys/types.h"
 
 #include "../internal/common.h"
-#include "../libc/malloc.h"
+#include "libc/malloc.h"
 
 /** Unified data type for possible data sources for scanf. */

uspace/lib/posix/source/stdlib.c

@@ -37 +37 @@
 
 #include "internal/common.h"
-#include "stdlib.h"
-
-#include "errno.h"
-#include "fcntl.h"
-#include "limits.h"
-#include "string.h"
-#include "sys/stat.h"
-#include "unistd.h"
+#include "posix/stdlib.h"
+
+#include "posix/errno.h"
+#include "posix/fcntl.h"
+#include "posix/limits.h"
+#include "posix/string.h"
+#include "posix/sys/stat.h"
+#include "posix/unistd.h"
 
 #include "libc/sort.h"

uspace/lib/posix/source/stdlib/strtol.c

@@ -36 +36 @@
 
 #include "../internal/common.h"
-#include "../stdlib.h"
-
-#include "../ctype.h"
-#include "../errno.h"
-#include "../inttypes.h"
-#include "../limits.h"
+#include "posix/stdlib.h"
+
+#include "posix/ctype.h"
+#include "posix/errno.h"
+#include "posix/inttypes.h"
+#include "posix/limits.h"
 
 #define intmax_t posix_intmax_t

uspace/lib/posix/source/stdlib/strtold.c

@@ -36 +36 @@
 
 /* Must be first. */
-#include "../stdbool.h"
+#include "posix/stdbool.h"
 
 #include "../internal/common.h"
-#include "../stdlib.h"
-
-#include "../assert.h"
-#include "../ctype.h"
-#include "../stdint.h"
-#include "../strings.h"
-#include "../errno.h"
-#include "../limits.h"
-
-#include "../float.h"
+#include "posix/stdlib.h"
+
+#include "posix/assert.h"
+#include "posix/ctype.h"
+#include "posix/stdint.h"
+#include "posix/strings.h"
+#include "posix/errno.h"
+#include "posix/limits.h"
+
+#include "posix/float.h"
 
 #ifndef HUGE_VALL

uspace/lib/posix/source/string.c

@@ -37 +37 @@
 
 #include "internal/common.h"
-#include "string.h"
-
-#include "assert.h"
-#include "errno.h"
-#include "limits.h"
-#include "stdlib.h"
-#include "signal.h"
+#include "posix/string.h"
+
+#include "posix/assert.h"
+#include "posix/errno.h"
+#include "posix/limits.h"
+#include "posix/stdlib.h"
+#include "posix/signal.h"
 
 #include "libc/str_error.h"

uspace/lib/posix/source/strings.c

@@ -37 +37 @@
 
 #include "internal/common.h"
-#include "strings.h"
+#include "posix/strings.h"
 
-#include "string.h"
-#include "ctype.h"
+#include "posix/string.h"
+#include "posix/ctype.h"
 
 #include "libc/mem.h"

uspace/lib/posix/source/sys/stat.c

@@ -37 +37 @@
 
 #include "../internal/common.h"
-#include "stat.h"
+#include "posix/sys/stat.h"
+#include "libc/sys/stat.h"
 
-#include "../errno.h"
-#include "../libc/mem.h"
+#include "posix/errno.h"
+#include "libc/mem.h"
 
 /**

uspace/lib/posix/source/sys/wait.c

@@ -37 +37 @@
 
 #include "../internal/common.h"
-#include "wait.h"
+#include "posix/sys/wait.h"
 
-#include "../libc/task.h"
-#include "../assert.h"
-#include "../errno.h"
-#include "../limits.h"
-#include "../signal.h"
+#include "libc/task.h"
+#include "posix/assert.h"
+#include "posix/errno.h"
+#include "posix/limits.h"
+#include "posix/signal.h"
 
 int __posix_wifexited(int status) {

uspace/lib/posix/source/time.c

@@ -37 +37 @@
 
 /* Must be first. */
-#include "stdbool.h"
+#include "posix/stdbool.h"
 
 #include "internal/common.h"
-#include "time.h"
-
-#include "ctype.h"
-#include "errno.h"
-#include "signal.h"
-#include "assert.h"
+#include "posix/time.h"
+
+#include "posix/ctype.h"
+#include "posix/errno.h"
+#include "posix/signal.h"
+#include "posix/assert.h"
 
 #include "libc/malloc.h"

uspace/lib/posix/source/unistd.c

@@ -37 +37 @@
 
 #include "internal/common.h"
-#include "unistd.h"
-
-#include "errno.h"
-#include "string.h"
-#include "fcntl.h"
+#include "posix/unistd.h"
+
+#include "posix/errno.h"
+#include "posix/string.h"
+#include "posix/fcntl.h"
 
 #include "libc/task.h"