Changeset 368ee04 in mainline for uspace/lib/posix/include

Timestamp:

2017-04-05T18:10:39Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

Location:

uspace/lib/posix/include/posix

Files:

• fcntl.h (modified) (1 diff)
• sys/stat.h (modified) (2 diffs)
• sys/types.h (modified) (1 diff)

uspace/lib/posix/include/posix/fcntl.h

@@ -41 +41 @@
 
 #include "sys/types.h"
-#include "libc/fcntl.h"
 #include "errno.h"
+
+#undef O_CREAT
+#undef O_EXCL
+#undef O_TRUNC
+#undef O_APPEND
+#undef O_RDONLY
+#undef O_RDWR
+#undef O_WRONLY
+#define O_CREAT   1
+#define O_EXCL    2
+#define O_TRUNC   4
+#define O_APPEND  8
+#define O_RDONLY  16
+#define O_RDWR    32
+#define O_WRONLY  64
 
 /* Mask for file access modes. */

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

@@ -115 +115 @@
         __POSIX_DEF__(dev_t)     st_dev;     /* ID of device containing file */
         __POSIX_DEF__(ino_t)     st_ino;     /* inode number */
-        mode_t          st_mode;    /* protection */
+        __POSIX_DEF__(mode_t)    st_mode;    /* protection */
         __POSIX_DEF__(nlink_t)   st_nlink;   /* number of hard links */
         __POSIX_DEF__(uid_t)     st_uid;     /* user ID of owner */
@@ -131 +131 @@
 extern int __POSIX_DEF__(lstat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
 extern int __POSIX_DEF__(stat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
-extern int __POSIX_DEF__(chmod)(const char *path, mode_t mode);
-extern mode_t __POSIX_DEF__(umask)(mode_t mask);
-extern int mkdir(const char *, mode_t);
+extern int __POSIX_DEF__(chmod)(const char *path, __POSIX_DEF__(mode_t) mode);
+extern __POSIX_DEF__(mode_t) __POSIX_DEF__(umask)(__POSIX_DEF__(mode_t) mask);
+extern int __POSIX_DEF__(mkdir)(const char *path, __POSIX_DEF__(mode_t) mode);
 
 

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

@@ -53 +53 @@
 typedef int64_t __POSIX_DEF__(pid_t);
 typedef sysarg_t __POSIX_DEF__(dev_t);
+typedef unsigned int __POSIX_DEF__(mode_t);
 
 /* PThread Types */