projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix null pointer dereference in setitimer time32 compat shim
[musl]
/
include
/
sys
/
resource.h
diff --git
a/include/sys/resource.h
b/include/sys/resource.h
index
7fd6a37
..
e0c86ae
100644
(file)
--- a/
include/sys/resource.h
+++ b/
include/sys/resource.h
@@
-15,17
+15,16
@@
extern "C" {
#endif
#include <bits/alltypes.h>
#endif
#include <bits/alltypes.h>
+#include <bits/resource.h>
typedef unsigned long long rlim_t;
typedef unsigned long long rlim_t;
-struct rlimit
-{
+struct rlimit {
rlim_t rlim_cur;
rlim_t rlim_max;
};
rlim_t rlim_cur;
rlim_t rlim_max;
};
-struct rusage
-{
+struct rusage {
struct timeval ru_utime;
struct timeval ru_stime;
/* linux extentions, but useful */
struct timeval ru_utime;
struct timeval ru_stime;
/* linux extentions, but useful */
@@
-67,7
+66,8
@@
int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
#define PRIO_USER 2
#define RUSAGE_SELF 0
#define PRIO_USER 2
#define RUSAGE_SELF 0
-#define RUSAGE_CHILDREN 1
+#define RUSAGE_CHILDREN (-1)
+#define RUSAGE_THREAD 1
#define RLIM_INFINITY (~0ULL)
#define RLIM_SAVED_CUR RLIM_INFINITY
#define RLIM_INFINITY (~0ULL)
#define RLIM_SAVED_CUR RLIM_INFINITY
@@
-78,11
+78,13
@@
int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
#define RLIMIT_DATA 2
#define RLIMIT_STACK 3
#define RLIMIT_CORE 4
#define RLIMIT_DATA 2
#define RLIMIT_STACK 3
#define RLIMIT_CORE 4
+#ifndef RLIMIT_RSS
#define RLIMIT_RSS 5
#define RLIMIT_RSS 5
-#define RLIMIT_NOFILE 7
-#define RLIMIT_AS 9
#define RLIMIT_NPROC 6
#define RLIMIT_NPROC 6
+#define RLIMIT_NOFILE 7
#define RLIMIT_MEMLOCK 8
#define RLIMIT_MEMLOCK 8
+#define RLIMIT_AS 9
+#endif
#define RLIMIT_LOCKS 10
#define RLIMIT_SIGPENDING 11
#define RLIMIT_MSGQUEUE 12
#define RLIMIT_LOCKS 10
#define RLIMIT_SIGPENDING 11
#define RLIMIT_MSGQUEUE 12
@@
-93,12
+95,19
@@
int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
#define RLIM_NLIMITS RLIMIT_NLIMITS
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
#define RLIM_NLIMITS RLIMIT_NLIMITS
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define RLIM64_INFINITY RLIM_INFINITY
+#define RLIM64_SAVED_CUR RLIM_SAVED_CUR
+#define RLIM64_SAVED_MAX RLIM_SAVED_MAX
#define getrlimit64 getrlimit
#define setrlimit64 setrlimit
#define rlimit64 rlimit
#define rlim64_t rlim_t
#endif
#define getrlimit64 getrlimit
#define setrlimit64 setrlimit
#define rlimit64 rlimit
#define rlim64_t rlim_t
#endif
+#if _REDIR_TIME64
+__REDIR(getrusage, __getrusage_time64);
+#endif
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif