X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fconf%2Fsysconf.c;h=5b6c14e520f2c97e93bfc753e632cd6ae76221e9;hp=a660257d6fbf7db265e4f44121a1f7273ea105d0;hb=2e0c1fed36be1f1435de79bfc7cdc34824cb5614;hpb=81af503610761a69476a3adbe8341fa8b6d078aa

diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index a660257d..5b6c14e5 100644
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -1,18 +1,21 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
+#include <sys/resource.h>
+#include "syscall.h"
 
 #define VER (-2)
 #define OFLOW (-3)
+#define RLIM(x) (-32768|(RLIMIT_ ## x))
 
 long sysconf(int name)
 {
 	static const short values[] = {
 		[_SC_ARG_MAX] = OFLOW,
-		[_SC_CHILD_MAX] = -1,
+		[_SC_CHILD_MAX] = RLIM(NPROC),
 		[_SC_CLK_TCK] = 100,
 		[_SC_NGROUPS_MAX] = 32,
-		[_SC_OPEN_MAX] = 1024,
+		[_SC_OPEN_MAX] = RLIM(NOFILE),
 		[_SC_STREAM_MAX] = -1,
 		[_SC_TZNAME_MAX] = TZNAME_MAX,
 		[_SC_JOB_CONTROL] = 1,
@@ -36,7 +39,7 @@ long sysconf(int name)
 		[_SC_AIO_PRIO_DELTA_MAX] = 0, /* ?? */
 		[_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
 		[_SC_MQ_OPEN_MAX] = -1,
-		[_SC_MQ_PRIO_MAX] = _POSIX_MQ_PRIO_MAX,
+		[_SC_MQ_PRIO_MAX] = MQ_PRIO_MAX,
 		[_SC_VERSION] = VER,
 		[_SC_PAGE_SIZE] = PAGE_SIZE,
 		[_SC_RTSIG_MAX] = 63, /* ?? */
@@ -82,8 +85,8 @@ long sysconf(int name)
 		[_SC_LOGIN_NAME_MAX] = 256,
 		[_SC_TTY_NAME_MAX] = TTY_NAME_MAX,
 		[_SC_THREAD_DESTRUCTOR_ITERATIONS] = _POSIX_THREAD_DESTRUCTOR_ITERATIONS,
-		[_SC_THREAD_KEYS_MAX] = -1,
-		[_SC_THREAD_STACK_MIN] = 2*PAGE_SIZE,
+		[_SC_THREAD_KEYS_MAX] = PTHREAD_KEYS_MAX,
+		[_SC_THREAD_STACK_MIN] = PTHREAD_STACK_MIN,
 		[_SC_THREAD_THREADS_MAX] = -1,
 		[_SC_THREAD_ATTR_STACKADDR] = -1,
 		[_SC_THREAD_ATTR_STACKSIZE] = VER,
@@ -217,6 +220,10 @@ long sysconf(int name)
 	} else if (values[name] == OFLOW) {
 		if (name == _SC_ARG_MAX) return ARG_MAX;
 		if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX;
+	} else if (values[name] < 0) {
+		long lim[2];
+		__syscall(SYS_getrlimit, values[name]&16383, lim);
+		return lim[0] < 0 ? LONG_MAX : lim[0];
 	}
 	return values[name];
 }