Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / confstr.c

diff --git a/gen/confstr.c b/gen/confstr.c
index 419571be5df9026f729cbe1a7a120595daef946c..a7f9613ae15b600e02cb3bceceb7a431022d5e7a 100644 (file)
--- a/gen/confstr.c
+++ b/gen/confstr.c
@@ -64,9 +64,47 @@
 #include <unistd.h>
 #include <stdio.h>     /* for P_tmpdir */
 
+#ifndef __has_include
 #include <dirhelper_priv.h>
+#else
+#if __has_include(<dirhelper_priv.h>)
+#include <dirhelper_priv.h>
+#else
+typedef enum {
+    DIRHELPER_USER_LOCAL = 0,
+    DIRHELPER_USER_LOCAL_TEMP,
+    DIRHELPER_USER_LOCAL_CACHE,
+    DIRHELPER_USER_LOCAL_LAST = DIRHELPER_USER_LOCAL_CACHE
+} dirhelper_which_t;
+#endif
+#endif
+
+#include "libc_private.h"
+
+#if __DARWIN_UNIX03
+static char *(*__dirhelper_func)(int, char *, size_t);
+
+__attribute__((__visibility__("hidden")))
+void
+__confstr_init(const struct _libc_functions *funcs)
+{
+       __dirhelper_func = funcs->dirhelper;
+}
 
-extern char *_dirhelper(dirhelper_which_t which, char *path, size_t pathlen);
+__attribute__((__visibility__("hidden")))
+char *
+__dirhelper(dirhelper_which_t which, char *path, size_t pathlen)
+{
+       if (__dirhelper_func) {
+               return __dirhelper_func(which, path, pathlen);
+       } else {
+               return NULL;
+       }
+}
+#else // !__DARWIN_UNIX03
+__attribute__((__visibility__("hidden")))
+char *__dirhelper(dirhelper_which_t which, char *path, size_t pathlen);
+#endif // !__DARWIN_UNIX03
 
 #if __DARWIN_UNIX03
 #define CONFSTR_ERR_RET        0
@@ -120,16 +158,31 @@ confstr(name, buf, len)
 
        case _CS_XBS5_ILP32_OFF32_LINTFLAGS:            /* legacy */
 
+       case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
+       case _CS_XBS5_ILP32_OFFBIG_LIBS:                /* legacy */
+
+       case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:           /* legacy */
+
+       case _CS_POSIX_V6_LP64_OFF64_LIBS:
+       case _CS_XBS5_LP64_OFF64_LIBS:                  /* legacy */
+
+       case _CS_XBS5_LP64_OFF64_LINTFLAGS:             /* legacy */
+
+       case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
+       case _CS_XBS5_LPBIG_OFFBIG_LIBS:                /* legacy */
+
+       case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:           /* legacy */
+               /* No special flags... yet */
+               p = "";
+               goto docopy;
+
        case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
        case _CS_XBS5_ILP32_OFFBIG_CFLAGS:              /* legacy */
 
        case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
        case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:             /* legacy */
-
-       case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
-       case _CS_XBS5_ILP32_OFFBIG_LIBS:                /* legacy */
-
-       case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:           /* legacy */
+               p = "-W 32";
+               goto docopy;
 
        case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
        case _CS_XBS5_LP64_OFF64_CFLAGS:                /* legacy */
@@ -137,23 +190,12 @@ confstr(name, buf, len)
        case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
        case _CS_XBS5_LP64_OFF64_LDFLAGS:               /* legacy */
 
-       case _CS_POSIX_V6_LP64_OFF64_LIBS:
-       case _CS_XBS5_LP64_OFF64_LIBS:                  /* legacy */
-
-       case _CS_XBS5_LP64_OFF64_LINTFLAGS:             /* legacy */
-
        case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
        case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:              /* legacy */
 
        case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
        case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:             /* legacy */
-
-       case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
-       case _CS_XBS5_LPBIG_OFFBIG_LIBS:                /* legacy */
-
-       case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:           /* legacy */
-               /* No special flags... yet */
-               p = "";
+               p = "-W 64";
                goto docopy;
 
        case _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS:
@@ -172,8 +214,11 @@ docopy:
                        errno = ENOMEM;
                        return (CONFSTR_ERR_RET);
                }
-               if (_dirhelper(DIRHELPER_USER_LOCAL, p, PATH_MAX) == NULL)
+               if (__dirhelper(DIRHELPER_USER_LOCAL, p, PATH_MAX) == NULL) {
+                       if (errno != ENOMEM)
+                               errno = EIO;
                        return (CONFSTR_ERR_RET);
+               }
                goto docopy;
 
        case _CS_DARWIN_USER_TEMP_DIR:
@@ -181,15 +226,20 @@ docopy:
                        errno = ENOMEM;
                        return (CONFSTR_ERR_RET);
                }
-               if (_dirhelper(DIRHELPER_USER_LOCAL_TEMP, p, PATH_MAX) == NULL) {
+               if (__dirhelper(DIRHELPER_USER_LOCAL_TEMP, p, PATH_MAX) == NULL) {
+                       int dh_errno = errno;
                        /*
-                        * If _dirhelper() fails, try TMPDIR and P_tmpdir,
+                        * If __dirhelper() fails, try TMPDIR and P_tmpdir,
                         * finally failing otherwise.
                         */
                        if ((p = getenv("TMPDIR")) && access(p, W_OK) == 0)
                                goto docopy;
                        if (access(p = P_tmpdir, W_OK) == 0)
                                goto docopy;
+                       if (dh_errno == ENOMEM)
+                               errno = ENOMEM;
+                       else
+                               errno = EIO;
                        return (CONFSTR_ERR_RET);
                }
                goto docopy;
@@ -199,8 +249,11 @@ docopy:
                        errno = ENOMEM;
                        return (CONFSTR_ERR_RET);
                }
-               if (_dirhelper(DIRHELPER_USER_LOCAL_CACHE, p, PATH_MAX) == NULL)
+               if (__dirhelper(DIRHELPER_USER_LOCAL_CACHE, p, PATH_MAX) == NULL) {
+                       if (errno != ENOMEM)
+                               errno = EIO;
                        return (CONFSTR_ERR_RET);
+               }
                goto docopy;
 
        default: