fix inadvertent introduction of extern object stx
[musl] / src / conf / sysconf.c
index 136bc1d..3baaed3 100644 (file)
@@ -18,6 +18,7 @@
 #define JT_PHYS_PAGES JT(8)
 #define JT_AVPHYS_PAGES JT(9)
 #define JT_ZERO JT(10)
+#define JT_DELAYTIMER_MAX JT(11)
 
 #define RLIM(x) (-32768|(RLIMIT_ ## x))
 
@@ -33,7 +34,7 @@ long sysconf(int name)
                [_SC_TZNAME_MAX] = TZNAME_MAX,
                [_SC_JOB_CONTROL] = 1,
                [_SC_SAVED_IDS] = 1,
-               [_SC_REALTIME_SIGNALS] = 1,
+               [_SC_REALTIME_SIGNALS] = VER,
                [_SC_PRIORITY_SCHEDULING] = -1,
                [_SC_TIMERS] = VER,
                [_SC_ASYNCHRONOUS_IO] = VER,
@@ -50,7 +51,7 @@ long sysconf(int name)
                [_SC_AIO_LISTIO_MAX] = -1,
                [_SC_AIO_MAX] = -1,
                [_SC_AIO_PRIO_DELTA_MAX] = JT_ZERO, /* ?? */
-               [_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
+               [_SC_DELAYTIMER_MAX] = JT_DELAYTIMER_MAX,
                [_SC_MQ_OPEN_MAX] = -1,
                [_SC_MQ_PRIO_MAX] = JT_MQ_PRIO_MAX,
                [_SC_VERSION] = VER,
@@ -65,11 +66,9 @@ long sysconf(int name)
                [_SC_BC_SCALE_MAX] = _POSIX2_BC_SCALE_MAX,
                [_SC_BC_STRING_MAX] = _POSIX2_BC_STRING_MAX,
                [_SC_COLL_WEIGHTS_MAX] = COLL_WEIGHTS_MAX,
-               [_SC_EQUIV_CLASS_MAX] = -1, /* ?? */
                [_SC_EXPR_NEST_MAX] = -1,
                [_SC_LINE_MAX] = -1,
                [_SC_RE_DUP_MAX] = RE_DUP_MAX,
-               [_SC_CHARCLASS_NAME_MAX] = -1, /* ?? */
                [_SC_2_VERSION] = VER,
                [_SC_2_C_BIND] = VER,
                [_SC_2_C_DEV] = -1,
@@ -77,20 +76,7 @@ long sysconf(int name)
                [_SC_2_FORT_RUN] = -1,
                [_SC_2_SW_DEV] = -1,
                [_SC_2_LOCALEDEF] = -1,
-               [_SC_PII] = -1, /* ????????? */
-               [_SC_PII_XTI] = -1,
-               [_SC_PII_SOCKET] = -1,
-               [_SC_PII_INTERNET] = -1,
-               [_SC_PII_OSI] = -1,
-               [_SC_POLL] = 1,
-               [_SC_SELECT] = 1,
                [_SC_IOV_MAX] = IOV_MAX,
-               [_SC_PII_INTERNET_STREAM] = -1,
-               [_SC_PII_INTERNET_DGRAM] = -1,
-               [_SC_PII_OSI_COTS] = -1,
-               [_SC_PII_OSI_CLTS] = -1,
-               [_SC_PII_OSI_M] = -1,
-               [_SC_T_IOV_MAX] = -1,
                [_SC_THREADS] = VER,
                [_SC_THREAD_SAFE_FUNCTIONS] = VER,
                [_SC_GETGR_R_SIZE_MAX] = -1,
@@ -120,78 +106,33 @@ long sysconf(int name)
                [_SC_XOPEN_ENH_I18N] = 1,
                [_SC_XOPEN_SHM] = 1,
                [_SC_2_CHAR_TERM] = -1,
-               [_SC_2_C_VERSION] = -1,
                [_SC_2_UPE] = -1,
                [_SC_XOPEN_XPG2] = -1,
                [_SC_XOPEN_XPG3] = -1,
                [_SC_XOPEN_XPG4] = -1,
-               [_SC_CHAR_BIT] = -1,
-               [_SC_CHAR_MAX] = -1,
-               [_SC_CHAR_MIN] = -1,
-               [_SC_INT_MAX] = -1,
-               [_SC_INT_MIN] = -1,
-               [_SC_LONG_BIT] = -1,
-               [_SC_WORD_BIT] = -1,
-               [_SC_MB_LEN_MAX] = -1,
                [_SC_NZERO] = NZERO,
-               [_SC_SSIZE_MAX] = -1,
-               [_SC_SCHAR_MAX] = -1,
-               [_SC_SCHAR_MIN] = -1,
-               [_SC_SHRT_MAX] = -1,
-               [_SC_SHRT_MIN] = -1,
-               [_SC_UCHAR_MAX] = -1,
-               [_SC_UINT_MAX] = -1,
-               [_SC_ULONG_MAX] = -1,
-               [_SC_USHRT_MAX] = -1,
-               [_SC_NL_ARGMAX] = -1,
-               [_SC_NL_LANGMAX] = -1,
-               [_SC_NL_MSGMAX] = -1,
-               [_SC_NL_NMAX] = -1,
-               [_SC_NL_SETMAX] = -1,
-               [_SC_NL_TEXTMAX] = -1,
                [_SC_XBS5_ILP32_OFF32] = -1,
-               [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_XBS5_LPBIG_OFFBIG] = -1,
                [_SC_XOPEN_LEGACY] = -1,
                [_SC_XOPEN_REALTIME] = -1,
                [_SC_XOPEN_REALTIME_THREADS] = -1,
                [_SC_ADVISORY_INFO] = VER,
                [_SC_BARRIERS] = VER,
-               [_SC_BASE] = -1,
-               [_SC_C_LANG_SUPPORT] = -1,
-               [_SC_C_LANG_SUPPORT_R] = -1,
                [_SC_CLOCK_SELECTION] = VER,
                [_SC_CPUTIME] = VER,
                [_SC_THREAD_CPUTIME] = VER,
-               [_SC_DEVICE_IO] = -1,
-               [_SC_DEVICE_SPECIFIC] = -1,
-               [_SC_DEVICE_SPECIFIC_R] = -1,
-               [_SC_FD_MGMT] = -1,
-               [_SC_FIFO] = -1,
-               [_SC_PIPE] = -1,
-               [_SC_FILE_ATTRIBUTES] = -1,
-               [_SC_FILE_LOCKING] = -1,
-               [_SC_FILE_SYSTEM] = -1,
                [_SC_MONOTONIC_CLOCK] = VER,
-               [_SC_MULTI_PROCESS] = -1,
-               [_SC_SINGLE_PROCESS] = -1,
-               [_SC_NETWORKING] = -1,
                [_SC_READER_WRITER_LOCKS] = VER,
                [_SC_SPIN_LOCKS] = VER,
                [_SC_REGEXP] = 1,
-               [_SC_REGEX_VERSION] = -1,
                [_SC_SHELL] = 1,
-               [_SC_SIGNALS] = -1,
                [_SC_SPAWN] = VER,
                [_SC_SPORADIC_SERVER] = -1,
                [_SC_THREAD_SPORADIC_SERVER] = -1,
-               [_SC_SYSTEM_DATABASE] = -1,
-               [_SC_SYSTEM_DATABASE_R] = -1,
                [_SC_TIMEOUTS] = VER,
                [_SC_TYPED_MEMORY_OBJECTS] = -1,
-               [_SC_USER_GROUPS] = -1,
-               [_SC_USER_GROUPS_R] = -1,
                [_SC_2_PBS] = -1,
                [_SC_2_PBS_ACCOUNTING] = -1,
                [_SC_2_PBS_LOCATE] = -1,
@@ -201,8 +142,8 @@ long sysconf(int name)
                [_SC_STREAMS] = JT_ZERO,
                [_SC_2_PBS_CHECKPOINT] = -1,
                [_SC_V6_ILP32_OFF32] = -1,
-               [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_V6_LPBIG_OFFBIG] = -1,
                [_SC_HOST_NAME_MAX] = HOST_NAME_MAX,
                [_SC_TRACE] = -1,
@@ -213,8 +154,8 @@ long sysconf(int name)
                [_SC_IPV6] = VER,
                [_SC_RAW_SOCKETS] = VER,
                [_SC_V7_ILP32_OFF32] = -1,
-               [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-               [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+               [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+               [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
                [_SC_V7_LPBIG_OFFBIG] = -1,
                [_SC_SS_REPL_MAX] = -1,
                [_SC_TRACE_EVENT_NAME_MAX] = -1,
@@ -234,6 +175,8 @@ long sysconf(int name)
        } else if (values[name] < -256) {
                struct rlimit lim;
                getrlimit(values[name]&16383, &lim);
+               if (lim.rlim_cur == RLIM_INFINITY)
+                       return -1;
                return lim.rlim_cur > LONG_MAX ? LONG_MAX : lim.rlim_cur;
        }
 
@@ -248,6 +191,8 @@ long sysconf(int name)
                return PAGE_SIZE;
        case JT_SEM_VALUE_MAX & 255:
                return SEM_VALUE_MAX;
+       case JT_DELAYTIMER_MAX & 255:
+               return DELAYTIMER_MAX;
        case JT_NPROCESSORS_CONF & 255:
        case JT_NPROCESSORS_ONLN & 255: ;
                unsigned char set[128] = {1};
@@ -259,7 +204,6 @@ long sysconf(int name)
        case JT_PHYS_PAGES & 255:
        case JT_AVPHYS_PAGES & 255: ;
                unsigned long long mem;
-               int __lsysinfo(struct sysinfo *);
                struct sysinfo si;
                __lsysinfo(&si);
                if (!si.mem_unit) si.mem_unit = 1;