Skip to content

Commit 0fc25c8

Browse files
joshuamegnauth54tgross35
authored andcommitted
redox: More resource.h, fcntl.h constants
(backport <#4666>) (cherry picked from commit b31ee9b)
1 parent b4a0fda commit 0fc25c8

File tree

2 files changed

+123
-9
lines changed

2 files changed

+123
-9
lines changed

libc-test/semver/redox.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ATF_COM
44
ATF_PERM
55
ATF_PUBL
66
ATF_USETRAILERS
7+
AT_FDCWD
78
B1000000
89
B1152000
910
B1500000
@@ -131,14 +132,32 @@ OLCUC
131132
O_ASYNC
132133
O_EXLOCK
133134
O_FSYNC
135+
O_NDELAY
134136
O_NOCTTY
135137
O_PATH
136138
O_SHLOCK
137139
O_SYMLINK
138140
PTHREAD_STACK_MIN
141+
RLIMIT_AS
142+
RLIMIT_CORE
143+
RLIMIT_CPU
144+
RLIMIT_DATA
145+
RLIMIT_FSIZE
146+
RLIMIT_LOCKS
147+
RLIMIT_MEMLOCK
148+
RLIMIT_MSGQUEUE
149+
RLIMIT_NICE
150+
RLIMIT_NLIMITS
151+
RLIMIT_NOFILE
152+
RLIMIT_NPROC
153+
RLIMIT_RSS
154+
RLIMIT_RTPRIO
155+
RLIMIT_SIGPENDING
156+
RLIMIT_STACK
139157
RLIM_INFINITY
140158
RLIM_SAVED_CUR
141159
RLIM_SAVED_MAX
160+
RUSAGE_BOTH
142161
RUSAGE_CHILDREN
143162
RUSAGE_SELF
144163
RUSAGE_THREAD
@@ -180,6 +199,42 @@ VWERASE
180199
WEXITED
181200
WNOWAIT
182201
WSTOPPED
202+
_CS_PATH
203+
_CS_POSIX_V5_WIDTH_RESTRICTED_ENVS
204+
_CS_POSIX_V6_ILP32_OFF32_CFLAGS
205+
_CS_POSIX_V6_ILP32_OFF32_LDFLAGS
206+
_CS_POSIX_V6_ILP32_OFF32_LIBS
207+
_CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
208+
_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
209+
_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
210+
_CS_POSIX_V6_ILP32_OFFBIG_LIBS
211+
_CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
212+
_CS_POSIX_V6_LP64_OFF64_CFLAGS
213+
_CS_POSIX_V6_LP64_OFF64_LDFLAGS
214+
_CS_POSIX_V6_LP64_OFF64_LIBS
215+
_CS_POSIX_V6_LP64_OFF64_LINTFLAGS
216+
_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
217+
_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
218+
_CS_POSIX_V6_LPBIG_OFFBIG_LIBS
219+
_CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
220+
_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS
221+
_CS_POSIX_V7_ILP32_OFF32_CFLAGS
222+
_CS_POSIX_V7_ILP32_OFF32_LDFLAGS
223+
_CS_POSIX_V7_ILP32_OFF32_LIBS
224+
_CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
225+
_CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
226+
_CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
227+
_CS_POSIX_V7_ILP32_OFFBIG_LIBS
228+
_CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
229+
_CS_POSIX_V7_LP64_OFF64_CFLAGS
230+
_CS_POSIX_V7_LP64_OFF64_LDFLAGS
231+
_CS_POSIX_V7_LP64_OFF64_LIBS
232+
_CS_POSIX_V7_LP64_OFF64_LINTFLAGS
233+
_CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
234+
_CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
235+
_CS_POSIX_V7_LPBIG_OFFBIG_LIBS
236+
_CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
237+
_CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
183238
_IOFBF
184239
_IOLBF
185240
_IONBF
@@ -247,6 +302,7 @@ pipe2
247302
pthread_condattr_setclock
248303
qsort
249304
reallocarray
305+
rlim_t
250306
setgrent
251307
setpwent
252308
setrlimit

src/unix/redox/mod.rs

Lines changed: 67 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ pub const F_LOCK: c_int = 1;
352352
pub const F_TLOCK: c_int = 2;
353353
pub const F_TEST: c_int = 3;
354354

355+
pub const AT_FDCWD: c_int = -100;
356+
355357
// FIXME(redox): relibc {
356358
pub const RTLD_DEFAULT: *mut c_void = ptr::null_mut();
357359
// }
@@ -517,6 +519,7 @@ pub const O_WRONLY: c_int = 0x0002_0000;
517519
pub const O_RDWR: c_int = 0x0003_0000;
518520
pub const O_ACCMODE: c_int = 0x0003_0000;
519521
pub const O_NONBLOCK: c_int = 0x0004_0000;
522+
pub const O_NDELAY: c_int = O_NONBLOCK;
520523
pub const O_APPEND: c_int = 0x0008_0000;
521524
pub const O_SHLOCK: c_int = 0x0010_0000;
522525
pub const O_EXLOCK: c_int = 0x0020_0000;
@@ -627,15 +630,6 @@ pub const PTHREAD_RWLOCK_INITIALIZER: crate::pthread_rwlock_t = crate::pthread_r
627630
};
628631
pub const PTHREAD_STACK_MIN: size_t = 4096;
629632

630-
// sys/resource.h
631-
pub const RLIM_INFINITY: u64 = !0;
632-
pub const RLIM_SAVED_CUR: u64 = RLIM_INFINITY;
633-
pub const RLIM_SAVED_MAX: u64 = RLIM_INFINITY;
634-
pub const RUSAGE_SELF: c_int = 0;
635-
pub const RUSAGE_CHILDREN: c_int = -1;
636-
pub const RUSAGE_BOTH: c_int = -2;
637-
pub const RUSAGE_THREAD: c_int = 1;
638-
639633
// signal.h
640634
pub const SIG_BLOCK: c_int = 0;
641635
pub const SIG_UNBLOCK: c_int = 1;
@@ -774,6 +768,32 @@ pub const MS_ASYNC: c_int = 0x0001;
774768
pub const MS_INVALIDATE: c_int = 0x0002;
775769
pub const MS_SYNC: c_int = 0x0004;
776770

771+
// sys/resource.h
772+
pub const RLIM_INFINITY: rlim_t = !0;
773+
pub const RLIM_SAVED_CUR: rlim_t = RLIM_INFINITY;
774+
pub const RLIM_SAVED_MAX: rlim_t = RLIM_INFINITY;
775+
pub const RLIMIT_CPU: c_int = 0;
776+
pub const RLIMIT_FSIZE: c_int = 1;
777+
pub const RLIMIT_DATA: c_int = 2;
778+
pub const RLIMIT_STACK: c_int = 3;
779+
pub const RLIMIT_CORE: c_int = 4;
780+
pub const RLIMIT_RSS: c_int = 5;
781+
pub const RLIMIT_NPROC: c_int = 6;
782+
pub const RLIMIT_NOFILE: c_int = 7;
783+
pub const RLIMIT_MEMLOCK: c_int = 8;
784+
pub const RLIMIT_AS: c_int = 9;
785+
pub const RLIMIT_LOCKS: c_int = 10;
786+
pub const RLIMIT_SIGPENDING: c_int = 11;
787+
pub const RLIMIT_MSGQUEUE: c_int = 12;
788+
pub const RLIMIT_NICE: c_int = 13;
789+
pub const RLIMIT_RTPRIO: c_int = 14;
790+
pub const RLIMIT_NLIMITS: c_int = 15;
791+
792+
pub const RUSAGE_SELF: c_int = 0;
793+
pub const RUSAGE_CHILDREN: c_int = -1;
794+
pub const RUSAGE_BOTH: c_int = -2;
795+
pub const RUSAGE_THREAD: c_int = 1;
796+
777797
// sys/select.h
778798
pub const FD_SETSIZE: usize = 1024;
779799

@@ -991,6 +1011,44 @@ pub const _SC_SYMLOOP_MAX: c_int = 173;
9911011
pub const _SC_HOST_NAME_MAX: c_int = 180;
9921012
// } POSIX.1
9931013

1014+
// confstr
1015+
pub const _CS_PATH: c_int = 0;
1016+
pub const _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS: c_int = 1;
1017+
pub const _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS: c_int = 4;
1018+
pub const _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS: c_int = 5;
1019+
pub const _CS_POSIX_V6_ILP32_OFF32_CFLAGS: c_int = 1116;
1020+
pub const _CS_POSIX_V6_ILP32_OFF32_LDFLAGS: c_int = 1117;
1021+
pub const _CS_POSIX_V6_ILP32_OFF32_LIBS: c_int = 1118;
1022+
pub const _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS: c_int = 1119;
1023+
pub const _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS: c_int = 1120;
1024+
pub const _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS: c_int = 1121;
1025+
pub const _CS_POSIX_V6_ILP32_OFFBIG_LIBS: c_int = 1122;
1026+
pub const _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS: c_int = 1123;
1027+
pub const _CS_POSIX_V6_LP64_OFF64_CFLAGS: c_int = 1124;
1028+
pub const _CS_POSIX_V6_LP64_OFF64_LDFLAGS: c_int = 1125;
1029+
pub const _CS_POSIX_V6_LP64_OFF64_LIBS: c_int = 1126;
1030+
pub const _CS_POSIX_V6_LP64_OFF64_LINTFLAGS: c_int = 1127;
1031+
pub const _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS: c_int = 1128;
1032+
pub const _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS: c_int = 1129;
1033+
pub const _CS_POSIX_V6_LPBIG_OFFBIG_LIBS: c_int = 1130;
1034+
pub const _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS: c_int = 1131;
1035+
pub const _CS_POSIX_V7_ILP32_OFF32_CFLAGS: c_int = 1132;
1036+
pub const _CS_POSIX_V7_ILP32_OFF32_LDFLAGS: c_int = 1133;
1037+
pub const _CS_POSIX_V7_ILP32_OFF32_LIBS: c_int = 1134;
1038+
pub const _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS: c_int = 1135;
1039+
pub const _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS: c_int = 1136;
1040+
pub const _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS: c_int = 1137;
1041+
pub const _CS_POSIX_V7_ILP32_OFFBIG_LIBS: c_int = 1138;
1042+
pub const _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS: c_int = 1139;
1043+
pub const _CS_POSIX_V7_LP64_OFF64_CFLAGS: c_int = 1140;
1044+
pub const _CS_POSIX_V7_LP64_OFF64_LDFLAGS: c_int = 1141;
1045+
pub const _CS_POSIX_V7_LP64_OFF64_LIBS: c_int = 1142;
1046+
pub const _CS_POSIX_V7_LP64_OFF64_LINTFLAGS: c_int = 1143;
1047+
pub const _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS: c_int = 1144;
1048+
pub const _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS: c_int = 1145;
1049+
pub const _CS_POSIX_V7_LPBIG_OFFBIG_LIBS: c_int = 1146;
1050+
pub const _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS: c_int = 1147;
1051+
9941052
pub const F_OK: c_int = 0;
9951053
pub const R_OK: c_int = 4;
9961054
pub const W_OK: c_int = 2;

0 commit comments

Comments
 (0)