Changeset bdae198 in mainline for uspace/lib/posix

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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:

• include/posix/stdio.h (modified) (1 diff)
• include/posix/stdlib.h (modified) (2 diffs)
• include/posix/unistd.h (modified) (2 diffs)
• source/stdlib.c (modified) (1 diff)
• source/unistd.c (modified) (1 diff)

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

@@ -65 +65 @@
 
 #define BUFSIZ  4096
-#define SEEK_SET  0
-#define SEEK_CUR  1
-#define SEEK_END  2
 
 typedef struct _IO_FILE FILE;

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

@@ -46 +46 @@
         #define NULL  ((void *) 0)
 #endif
+
+#define RAND_MAX  714025
 
 /* Process Termination */
@@ -122 +124 @@
 extern int __POSIX_DEF__(mkstemp)(char *tmpl);
 
+/* Pseudo-random number generator */
+extern int __POSIX_DEF__(rand)(void);
+extern void __POSIX_DEF__(srand)(unsigned int seed);
+
 /* Legacy Declarations */
 extern char *__POSIX_DEF__(mktemp)(char *tmpl);

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

@@ -44 +44 @@
 #include "stddef.h"
 
+#define SEEK_SET  0
+#define SEEK_CUR  1
+#define SEEK_END  2
+
 /* Process Termination */
 #define _exit exit
@@ -77 +81 @@
 extern ssize_t __POSIX_DEF__(read)(int fildes, void *buf, size_t nbyte);
 extern ssize_t __POSIX_DEF__(write)(int fildes, const void *buf, size_t nbyte);
+extern __POSIX_DEF__(off_t) __POSIX_DEF__(lseek)(int fildes,
+    __POSIX_DEF__(off_t) offset, int whence);
 extern int __POSIX_DEF__(fsync)(int fildes);
 extern int __POSIX_DEF__(ftruncate)(int fildes, __POSIX_DEF__(off_t) length);

uspace/lib/posix/source/stdlib.c

@@ -394 +394 @@
 
 /**
+ * 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);
+}
+
+/**
  * Creates and opens an unique temporary file from template.
  *

uspace/lib/posix/source/unistd.c

@@ -221 +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);
 }