X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmisc%2Fgetrlimit.c;h=a5558d8151525b5c13b43a7d29dbe7c9672c2f5b;hb=0440ed69eac766c712e974358c3e09d63e330f40;hp=1383525764f4d0ff6930db37029fe106591c917e;hpb=aa398f56fa398f2202b04e82c67f822f3233786f;p=musl

diff --git a/src/misc/getrlimit.c b/src/misc/getrlimit.c
index 13835257..a5558d81 100644
--- a/src/misc/getrlimit.c
+++ b/src/misc/getrlimit.c
@@ -1,15 +1,28 @@
 #include <sys/resource.h>
+#include <errno.h>
 #include "syscall.h"
-#include "libc.h"
+
+#define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
 int getrlimit(int resource, struct rlimit *rlim)
 {
-	long k_rlim[2];
+	int ret = syscall(SYS_prlimit64, 0, resource, 0, rlim);
+	if (!ret) {
+		FIX(rlim->rlim_cur);
+		FIX(rlim->rlim_max);
+	}
+#ifdef SYS_getrlimit
+	unsigned long k_rlim[2];
+	if (!ret || errno != ENOSYS)
+		return ret;
 	if (syscall(SYS_getrlimit, resource, k_rlim) < 0)
 		return -1;
-	rlim->rlim_cur = k_rlim[0] == -1 ? -1 : (unsigned long)k_rlim[0];
-	rlim->rlim_max = k_rlim[1] == -1 ? -1 : (unsigned long)k_rlim[1];
+	rlim->rlim_cur = k_rlim[0] == -1UL ? RLIM_INFINITY : k_rlim[0];
+	rlim->rlim_max = k_rlim[1] == -1UL ? RLIM_INFINITY : k_rlim[1];
+	FIX(rlim->rlim_cur);
+	FIX(rlim->rlim_max);
 	return 0;
+#else
+	return ret;
+#endif
 }
-
-LFS64(getrlimit);