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

Timestamp:

2013-02-25T19:11:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1935591

Parents:

c84f1a4

Message:

Libposix functions are without posix_ prefix

Prior this commit, libposix headers declared all functions as posix_*
and used macros to rename e.g. strncpy to posix_strncpy in all (ported)
sources.

After this change, libposix headers look as normal POSIX compliant headers
(well, almost) and no renaming is done in the source codei (of the ported
applications). Instead, the renaming is done at object files level to
bypass weird problems that are bound to happen if you use macros.

The scheme is following. libposix headers use special macro to declare
the names. When included from outside, the functions have their normal
(standard) names. When included from the libposix sources, posix_ prefix
is added. Thus, when libposix is compiled and linked, it contains the
posix_* naming while compiling of ported software uses the normal
non-prefixed versions. This way the posix_* can use HelenOS libc without
any problem. Before linking, the posix_* prefix is removed from all
symbols and special prefix helenos_libc_ is added to all functions
that exists in our (HelenOS) libc and its name clashes with the POSIX
one.

The following happens, for example, to the open() function that exists in
both libposix and in libc.

• Headers and sources of libc are left intact.
• Copy of libc.a is made and to all clashing functions is added the helenos_libc prefix. This library is called libc4posix.a.
• POSIX_DEF(open)(const char *) is used in libposix headers. This macro expands to plain open when included from the "outside world". But it expands to posix_open when included from libposix sources.
• Libposix is compiled and linked, containing posix_open() that internally calls open() [the original one from libc].
• Libposix is transformed - all open() are replaced with prefix variant: helenos_libc_open() and all posix_open() are replaced with open(). The transformed library is stored as libposixaslibc.a

Binutils and PCC are then linked with libc4posix and libposixaslibc
libraries instead of libc and libposix as was done previously.

WARNING: it looks that binutils, PCC and MSIM still works but not all
architectures were tested.

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 */