Changeset baeeee2 in mainline

Timestamp:

2012-09-04T12:44:40Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

32b3a12

Parents:

f8cbe2c3

Message:

libposix: less includes from libc

Location:

uspace/lib/posix

Files:

• include/posix/errno.h (modified) (1 diff)
• include/posix/malloc.h (added)
• include/posix/signal.h (modified) (1 diff)
• include/posix/stdarg.h (added)
• include/posix/stddef.h (modified) (1 diff)
• include/posix/stdio.h (modified) (1 diff)
• include/posix/stdlib.h (modified) (2 diffs)
• include/posix/sys/mman.h (modified) (2 diffs)
• include/posix/sys/stat.h (modified) (2 diffs)
• include/posix/sys/types.h (modified) (1 diff)
• include/posix/time.h (modified) (1 diff)
• include/posix/unistd.h (modified) (1 diff)
• source/fnmatch.c (modified) (7 diffs)
• source/sys/stat.c (modified) (1 diff)

uspace/lib/posix/include/posix/errno.h

@@ -66 +66 @@
 #undef errno
 #define errno (*__posix_errno())
-
-#include "unistd.h"
 
 extern int *__posix_errno(void);

uspace/lib/posix/include/posix/signal.h

@@ -36 +36 @@
 #define POSIX_SIGNAL_H_
 
-#include "libc/errno.h"
 #include "sys/types.h"
 

uspace/lib/posix/include/posix/stddef.h

@@ -36 +36 @@
 #define POSIX_STDDEF_H_
 
-#include "libc/stddef.h"
+#include "sys/types.h"
 
 #ifndef NULL

uspace/lib/posix/include/posix/stdio.h

@@ -41 +41 @@
 #include "libc/stdio.h"
 #include "sys/types.h"
-#include "libc/stdarg.h"
+#include "stdarg.h"
 #include "limits.h"
 

uspace/lib/posix/include/posix/stdlib.h

@@ -37 +37 @@
 #define POSIX_STDLIB_H_
 
-#include "libc/stdlib.h"
+#include "sys/types.h"
 
 #ifndef NULL
@@ -51 +51 @@
 extern int posix_atexit(void (*func)(void));
 extern void exit(int status);
+extern void abort(void) __attribute__((noreturn));
 
 /* Absolute Value */

uspace/lib/posix/include/posix/sys/mman.h

@@ -36 +36 @@
 #define POSIX_SYS_MMAN_H_
 
-#include "libc/sys/mman.h"
+#include "sys/types.h"
+#include <abi/mm/as.h>
+
+#define MAP_FAILED ((void *) -1)
+
+#define MAP_SHARED     (1 << 0)
+#define MAP_PRIVATE    (1 << 1)
+#define MAP_FIXED      (1 << 2)
+#define MAP_ANONYMOUS  (1 << 3)
 
 #undef PROT_NONE
@@ -43 +51 @@
 #undef PROT_EXEC
 #define PROT_NONE  0
-#define PROT_READ  PROTO_READ
-#define PROT_WRITE PROTO_WRITE
-#define PROT_EXEC  PROTO_EXEC
+#define PROT_READ  AS_AREA_READ
+#define PROT_WRITE AS_AREA_WRITE
+#define PROT_EXEC  AS_AREA_EXEC
+
+extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    posix_off_t offset);
+extern int munmap(void *start, size_t length);
 
 #endif /* POSIX_SYS_MMAN_H_ */

uspace/lib/posix/include/posix/sys/stat.h

@@ -37 +37 @@
 #define POSIX_SYS_STAT_H_
 
-#include "libc/sys/stat.h"
 #include "types.h"
 #include "../time.h"
@@ -130 +129 @@
 extern int posix_chmod(const char *path, mode_t mode);
 extern mode_t posix_umask(mode_t mask);
+extern int mkdir(const char *, mode_t);
 
 #ifndef LIBPOSIX_INTERNAL

uspace/lib/posix/include/posix/sys/types.h

@@ -38 +38 @@
 
 #include "libc/sys/types.h"
+#include "libc/sys/time.h"
 
 typedef unsigned int posix_ino_t;

uspace/lib/posix/include/posix/time.h

@@ -37 +37 @@
 #define POSIX_TIME_H_
 
-#include "libc/time.h"
 #include "sys/types.h"
 

uspace/lib/posix/include/posix/unistd.h

@@ -37 +37 @@
 #define POSIX_UNISTD_H_
 
-#include "libc/unistd.h"
 #include "sys/types.h"
+#include "stddef.h"
 
 /* Process Termination */

uspace/lib/posix/source/fnmatch.c

@@ -42 +42 @@
  */
 
+#define LIBPOSIX_INTERNAL
+
 #include "posix/stdbool.h"
 #include "posix/ctype.h"
@@ -47 +49 @@
 #include "posix/stdlib.h"
 #include "posix/assert.h"
-
-#define LIBPOSIX_INTERNAL
 
 #include "internal/common.h"
@@ -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/sys/stat.c

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