Changeset e4f8c77 in mainline for uspace/lib/posix/fcntl.h

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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.

File:

• uspace/lib/posix/fcntl.h (modified) (2 diffs)

uspace/lib/posix/fcntl.h

@@ -36 +36 @@
 #define POSIX_FCNTL_H_
 
+#include "sys/types.h"
 #include "libc/fcntl.h"
+#include "errno.h"
+
+/* Mask for file access modes. */
+#undef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 
 /* fcntl commands */
 #undef F_DUPFD
+#undef F_DUPFD_CLOEXEC
 #undef F_GETFD
 #undef F_SETFD
@@ -46 +53 @@
 #undef F_GETOWN
 #undef F_SETOWN
-#define F_DUPFD         0       /* Duplicate file descriptor. */
-#define F_GETFD         1       /* Get file descriptor flags. */
-#define F_SETFD         2       /* Set file descriptor flags. */
-#define F_GETFL         3       /* Get file status flags. */
-#define F_SETFL         4       /* Set file status flags. */
-#define F_GETOWN        5       /* Get owner. */
-#define F_SETOWN        6       /* Set owner. */
+#undef F_GETLK
+#undef F_SETLK
+#undef F_SETLKW
+#define F_DUPFD            0 /* Duplicate file descriptor. */
+#define F_DUPFD_CLOEXEC    1 /* Same as F_DUPFD but with FD_CLOEXEC flag set. */
+#define F_GETFD            2 /* Get file descriptor flags. */
+#define F_SETFD            3 /* Set file descriptor flags. */
+#define F_GETFL            4 /* Get file status and access flags. */
+#define F_SETFL            5 /* Set file status flags. */
+#define F_GETOWN           6 /* Get socket owner. */
+#define F_SETOWN           7 /* Set socket owner. */
+#define F_GETLK            8 /* Get locking information. */
+#define F_SETLK            9 /* Set locking information. */
+#define F_SETLKW          10 /* Set locking information; wait if blocked. */
 
 /* File descriptor flags used with F_GETFD and F_SETFD. */
 #undef FD_CLOEXEC
-#define FD_CLOEXEC      1       /* Close on exec. */
+#define FD_CLOEXEC         1 /* Close on exec. */
+
+#undef open
+#define open(path, ...) \
+        ({ \
+                int rc = open(path, ##__VA_ARGS__); \
+                if (rc < 0) { \
+                        errno = -rc; \
+                        rc = -1; \
+                } \
+                rc; \
+        })
 
 extern int posix_fcntl(int fd, int cmd, ...);