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

Timestamp:

2013-02-25T19:11:50Z (11 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/locale.h (modified) (4 diffs)

uspace/lib/posix/include/posix/locale.h

@@ -36 +36 @@
 #define POSIX_LOCALE_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 #ifndef NULL
         #define NULL ((void *) 0)
@@ -42 +46 @@
 #ifndef __locale_t_defined
         #define __locale_t_defined
-        typedef struct __posix_locale *posix_locale_t;
+        typedef struct __posix_locale *__POSIX_DEF__(locale_t);
         #ifndef LIBPOSIX_INTERNAL
-                #define locale_t posix_locale_t
+                #define locale_t __POSIX_DEF__(locale_t)
         #endif
 #endif
@@ -82 +86 @@
 #define LC_GLOBAL_LOCALE NULL
 
-struct posix_lconv {
+struct __POSIX_DEF__(lconv) {
         char *currency_symbol;
         char *decimal_point;
@@ -109 +113 @@
 };
 
-extern char *posix_setlocale(int category, const char *locale);
-extern struct posix_lconv *posix_localeconv(void);
+extern char *__POSIX_DEF__(setlocale)(int category, const char *locale);
+extern struct __POSIX_DEF__(lconv) *__POSIX_DEF__(localeconv)(void);
 
 /* POSIX Extensions */
-extern posix_locale_t posix_duplocale(posix_locale_t locobj);
-extern void posix_freelocale(posix_locale_t locobj);
-extern posix_locale_t posix_newlocale(int category_mask, const char *locale,
-    posix_locale_t base);
-extern posix_locale_t posix_uselocale(posix_locale_t newloc);
+extern __POSIX_DEF__(locale_t) __POSIX_DEF__(duplocale)(__POSIX_DEF__(locale_t) locobj);
+extern void __POSIX_DEF__(freelocale)(__POSIX_DEF__(locale_t) locobj);
+extern __POSIX_DEF__(locale_t) __POSIX_DEF__(newlocale)(int category_mask, const char *locale,
+    __POSIX_DEF__(locale_t) base);
+extern __POSIX_DEF__(locale_t) __POSIX_DEF__(uselocale)(__POSIX_DEF__(locale_t) newloc);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define lconv posix_lconv
-
-        #define setlocale posix_setlocale
-        #define localeconv posix_localeconv
-
-        #define newlocale posix_newlocale
-        #define uselocale posix_uselocale
-        #define duplocale posix_duplocale
-        #define freelocale posix_freelocale
-#endif
 
 #endif /* POSIX_LOCALE_H_ */