Changeset c8bb1633 in mainline for uspace/lib/posix/include/posix/sys/stat.h

Timestamp:

2013-07-10T08:58:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3908355, 4c53333

Parents:

30c1b75 (diff), 98abd40 (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:

Extending POSIX library

Merge from lp:~vojtech-horky/helenos/gcc-port.

This is work-in-progress merge from branch aimed at bringing GCC to run
inside HelenOS.

The most notable change is dealing with the name clashes in libposix and
libc. For ported applications, the libposix headers looks as normal
POSIX headers and there is no need to do preprocessor-based renaming inside
the ported application. The renaming is done inside object files instead.
See revision 1745 in lp:~vojtech-horky/helenos/gcc-port [1] for more
detailed explanation.
The solution is definitely not perfect but shall deal with the naming
conflicts in much safer manner than using the redefines.

There were some other changes as well, mostly small ones.

• Add some functions, some as ToDo ones (i.e. empty implementation).
• Add more POSIX headers, split some existing.

[1] ​http://bazaar.launchpad.net/~vojtech-horky/helenos/gcc-port/revision/1745

File:

• uspace/lib/posix/include/posix/sys/stat.h (modified) (3 diffs)

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

@@ -39 +39 @@
 #include "types.h"
 #include "../time.h"
+
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
 
 /* values are the same as on Linux */
@@ -108 +112 @@
 #define S_ISSOCK(m) ((m & S_IFSOCK) != 0) /* socket? (Not in POSIX.1-1996.) */
 
-struct posix_stat {
-        posix_dev_t     st_dev;     /* ID of device containing file */
-        posix_ino_t     st_ino;     /* inode number */
+struct __POSIX_DEF__(stat) {
+        __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_nlink_t   st_nlink;   /* number of hard links */
-        posix_uid_t     st_uid;     /* user ID of owner */
-        posix_gid_t     st_gid;     /* group ID of owner */
-        posix_dev_t     st_rdev;    /* device ID (if special file) */
-        posix_off_t     st_size;    /* total size, in bytes */
-        posix_blksize_t st_blksize; /* blocksize for file system I/O */
-        posix_blkcnt_t  st_blocks;  /* number of 512B blocks allocated */
+        __POSIX_DEF__(nlink_t)   st_nlink;   /* number of hard links */
+        __POSIX_DEF__(uid_t)     st_uid;     /* user ID of owner */
+        __POSIX_DEF__(gid_t)     st_gid;     /* group ID of owner */
+        __POSIX_DEF__(dev_t)     st_rdev;    /* device ID (if special file) */
+        __POSIX_DEF__(off_t)     st_size;    /* total size, in bytes */
+        __POSIX_DEF__(blksize_t) st_blksize; /* blocksize for file system I/O */
+        __POSIX_DEF__(blkcnt_t)  st_blocks;  /* number of 512B blocks allocated */
         time_t          st_atime;   /* time of last access */
         time_t          st_mtime;   /* time of last modification */
@@ -124 +128 @@
 };
 
-extern int posix_fstat(int fd, struct posix_stat *st);
-extern int posix_lstat(const char *restrict path, struct posix_stat *restrict st);
-extern int posix_stat(const char *restrict path, struct posix_stat *restrict st);
-extern int posix_chmod(const char *path, mode_t mode);
-extern mode_t posix_umask(mode_t mask);
+extern int __POSIX_DEF__(fstat)(int fd, struct __POSIX_DEF__(stat) *st);
+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);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define fstat posix_fstat
-        #define lstat posix_lstat
-        #define stat posix_stat
-        #define chmod posix_chmod
-        #define umask posix_umask
-#endif
 
 #endif /* POSIX_SYS_STAT_H */