Changeset f7e69f5 in mainline for uspace/lib/posix

Timestamp:

2012-05-25T23:17:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e1e4192

Parents:

0a0e6e7 (diff), df3f85f (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 mainline changes

Location:

uspace/lib/posix

Files:

• Makefile (modified) (1 diff)
• errno.h (modified) (1 diff)
• getopt.c (added)
• getopt.h (added)
• pwd.c (modified) (1 diff)
• stdbool.h (modified) (1 diff)
• stdio.h (modified) (1 diff)
• time.c (modified) (1 diff)
• unistd.c (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/posix/Makefile

@@ -43 +43 @@
         fcntl.c \
         fnmatch.c \
+        getopt.c \
         locale.c \
         math.c \

uspace/lib/posix/errno.h

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

uspace/lib/posix/pwd.c

@@ -38 +38 @@
 #include "string.h"
 #include "errno.h"
+#include "assert.h"
 
 static bool entry_read = false;

uspace/lib/posix/stdbool.h

@@ -37 +37 @@
 
 #ifdef LIBC_BOOL_H_
-        #error "You can't include bool.h and stdbool.h at the same time."
+#if (!defined(POSIX_STDIO_H_)) \
+                && (!defined(POSIX_STDLIB_H_)) \
+                && (!defined(POSIX_STRING_H_))
+#error "You can't include bool.h and stdbool.h at the same time."
 #endif
+#endif
+
 #define LIBC_BOOL_H_
 

uspace/lib/posix/stdio.h

@@ -37 +37 @@
 #define POSIX_STDIO_H_
 
+#include "stddef.h"
+#include "unistd.h"
 #include "libc/stdio.h"
 #include "sys/types.h"

uspace/lib/posix/time.c

@@ -45 +45 @@
 #include "errno.h"
 #include "signal.h"
+#include "assert.h"
 
 #include "libc/malloc.h"

uspace/lib/posix/unistd.c

@@ -49 +49 @@
 /* Array of environment variable strings (NAME=VALUE). */
 char **posix_environ = NULL;
+char *posix_optarg;
 
 /**

uspace/lib/posix/unistd.h

@@ -43 +43 @@
 #define _exit exit
 
-/* Option Arguments */
-extern char *optarg;
+extern char *posix_optarg;
 extern int optind, opterr, optopt;
-extern int getopt(int, char * const [], const char *);
+extern int posix_getopt(int, char * const [], const char *);
 
 /* Environment */
@@ -144 +143 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define getopt posix_getopt
+        #define optarg posix_optarg
+
         #define environ posix_environ