Changeset 8b863a62 in mainline for uspace/lib/posix/source

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/source

Files:

• ctype.c (modified) (1 diff)
• errno.c (modified) (2 diffs)
• fcntl.c (modified) (1 diff)
• fnmatch.c (modified) (1 diff)
• getopt.c (modified) (1 diff)
• internal/common.h (modified) (1 diff)
• locale.c (modified) (1 diff)
• math.c (deleted)
• pthread/condvar.c (added)
• pthread/keys.c (added)
• pthread/mutex.c (added)
• pthread/threads.c (added)
• pwd.c (modified) (1 diff)
• signal.c (modified) (1 diff)
• stdio.c (modified) (2 diffs)
• stdio/scanf.c (modified) (1 diff)
• stdlib.c (modified) (5 diffs)
• stdlib/strtol.c (modified) (1 diff)
• stdlib/strtold.c (modified) (1 diff)
• string.c (modified) (1 diff)
• strings.c (modified) (1 diff)
• sys/mman.c (moved) (moved from uspace/lib/c/generic/mman.c ) (3 diffs)
• sys/stat.c (modified) (1 diff)
• sys/wait.c (modified) (1 diff)
• time.c (modified) (2 diffs)
• unistd.c (modified) (7 diffs)

uspace/lib/posix/source/ctype.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "posix/ctype.h"

uspace/lib/posix/source/errno.c

@@ -32 +32 @@
 /** @file System error numbers.
  */
+#define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "posix/errno.h"
@@ -43 +45 @@
 {
         if (*__errno() != 0) {
-                _posix_errno = abs(*__errno());
+                _posix_errno = posix_abs(*__errno());
                 *__errno() = 0;
         }

uspace/lib/posix/source/fcntl.c

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"

uspace/lib/posix/source/fnmatch.c

@@ -43 +43 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "libc/stdbool.h"

uspace/lib/posix/source/getopt.c

@@ -33 +33 @@
  */
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"

uspace/lib/posix/source/internal/common.h

@@ -39 +39 @@
 #include <stdlib.h>
 
-#define not_implemented() (fprintf(stderr, \
-    "Function %s() in file %s at line %d is not implemented\n", \
-    __func__, __FILE__, __LINE__), abort())
+#define not_implemented() do { \
+                static int __not_implemented_counter = 0; \
+                if (__not_implemented_counter == 0) { \
+                        fprintf(stderr, "%s() not implemented in %s:%d, something will NOT work.\n", \
+                                __func__, __FILE__, __LINE__); \
+                } \
+                __not_implemented_counter++; \
+        } while (0)
 
 /* A little helper macro to avoid typing this over and over. */

uspace/lib/posix/source/locale.c

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"

uspace/lib/posix/source/pwd.c

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "libc/stdbool.h"

uspace/lib/posix/source/signal.c

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "posix/signal.h"

uspace/lib/posix/source/stdio.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
@@ -308 +309 @@
 }
 
-struct _posix_fpos {
-        off64_t offset;
-};
-
 /** Restores stream a to position previously saved with fgetpos().
  *

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

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "posix/assert.h"

uspace/lib/posix/source/stdlib.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
@@ -62 +63 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return 0;
 }
 
@@ -231 +233 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return 0;
 }
 
@@ -243 +246 @@
 int posix_system(const char *string) {
         // TODO: does nothing at the moment
+        not_implemented();
         return 0;
 }
@@ -387 +391 @@
                 free(ptr);
         }
+}
+
+/**
+ * Generate a pseudo random integer in the range 0 to RAND_MAX inclusive.
+ *
+ * @return The pseudo random integer.
+ */
+int posix_rand(void)
+{
+        return (int) random();
+}
+
+/**
+ * Initialize a new sequence of pseudo-random integers.
+ *
+ * @param seed The seed of the new sequence.
+ */
+void posix_srand(unsigned int seed)
+{
+        srandom(seed);
 }
 

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

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"

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

@@ -34 +34 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"

uspace/lib/posix/source/string.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"

uspace/lib/posix/source/strings.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
@@ -33 +33 @@
  */
 
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <as.h>
-#include <unistd.h>
+#define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
-void *mmap(void *start, size_t length, int prot, int flags, int fd,
-    aoff64_t offset)
+#include "../internal/common.h"
+#include <posix/sys/mman.h>
+#include <posix/sys/types.h>
+#include <libc/as.h>
+#include <posix/unistd.h>
+
+void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
+    __POSIX_DEF__(off_t) offset)
 {
         if (!start)
@@ -53 +57 @@
 }
 
-int munmap(void *start, size_t length)
+int posix_munmap(void *start, size_t length)
 {
         return as_area_destroy(start);

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

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"

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

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"

uspace/lib/posix/source/time.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
@@ -73 +74 @@
         posix_daylight = 0;
         posix_timezone = 0;
+}
+
+/**
+ * Get the time in seconds
+ *
+ * @param t If t is non-NULL, the return value is also stored in the memory
+ *          pointed to by t.
+ * @return  On success, the value of time in seconds since the Epoch
+ *          is returned. On error, (time_t)-1 is returned.
+ */
+time_t posix_time(time_t *t)
+{
+        return time(t);
 }
 

uspace/lib/posix/source/unistd.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
@@ -220 +221 @@
 {
         return errnify(write, fildes, buf, nbyte);
+}
+
+/**
+ * Reposition read/write file offset
+ *
+ * @param fildes File descriptor of the opened file.
+ * @param offset New offset in the file.
+ * @param whence The position from which the offset argument is specified.
+ * @return Upon successful completion, returns the resulting offset
+ *         as measured in bytes from the beginning of the file, -1 otherwise.
+ */
+posix_off_t posix_lseek(int fildes, posix_off_t offset, int whence)
+{
+        return errnify(lseek, fildes, offset, whence);
 }
 
@@ -374 +389 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return -1;
 }
 
@@ -384 +400 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return -1;
 }
 
@@ -396 +413 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return -1;
 }
 
@@ -408 +426 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return -1;
 }
 
@@ -419 +438 @@
         // TODO: low priority, just a compile-time dependency of binutils
         not_implemented();
+        return -1;
+}
+
+unsigned int posix_alarm(unsigned int seconds)
+{
+        not_implemented();
+        return 0;
 }