fix popen not to leak pipes from one child to another

[musl] / src / misc / getrlimit.c

diff --git a/src/misc/getrlimit.c b/src/misc/getrlimit.c
index 84a659d..2ab2f0f 100644 (file)
--- a/src/misc/getrlimit.c
+++ b/src/misc/getrlimit.c
@@ -1,15 +1,26 @@
 #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];
-       if (syscall2(__NR_getrlimit, resource, (long)k_rlim) < 0)
+       unsigned long k_rlim[2];
+       int ret = syscall(SYS_prlimit64, 0, resource, 0, rlim);
+       if (!ret) {
+               FIX(rlim->rlim_cur);
+               FIX(rlim->rlim_max);
+       }
+       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;
 }
 
-LFS64(getrlimit);
+weak_alias(getrlimit, getrlimit64);