mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Merge branch 'gnugrep-patch' into 'master'
remove rlimit part of gnu-grep patch See merge request redox-os/redox!2404
This commit is contained in:
commit
3337ea3ef8
@ -1,23 +1,4 @@
|
|||||||
Only in source: grep.patch
|
Only in source: grep.patch
|
||||||
diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c
|
|
||||||
--- source/lib/getdtablesize.c 2017-07-23 20:50:44.287742363 -0700
|
|
||||||
+++ source-new/lib/getdtablesize.c 2017-07-23 20:51:06.271284748 -0700
|
|
||||||
@@ -109,15 +109,6 @@
|
|
||||||
int
|
|
||||||
getdtablesize (void)
|
|
||||||
{
|
|
||||||
- struct rlimit lim;
|
|
||||||
-
|
|
||||||
- if (getrlimit (RLIMIT_NOFILE, &lim) == 0
|
|
||||||
- && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX
|
|
||||||
- && lim.rlim_cur != RLIM_INFINITY
|
|
||||||
- && lim.rlim_cur != RLIM_SAVED_CUR
|
|
||||||
- && lim.rlim_cur != RLIM_SAVED_MAX)
|
|
||||||
- return lim.rlim_cur;
|
|
||||||
-
|
|
||||||
return INT_MAX;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru source/lib/getprogname.c source-new/lib/getprogname.c
|
diff -ru source/lib/getprogname.c source-new/lib/getprogname.c
|
||||||
--- source/lib/getprogname.c 2017-01-16 09:29:13.000000000 -0800
|
--- source/lib/getprogname.c 2017-01-16 09:29:13.000000000 -0800
|
||||||
+++ source-new/lib/getprogname.c 2017-07-23 20:49:21.133618122 -0700
|
+++ source-new/lib/getprogname.c 2017-07-23 20:49:21.133618122 -0700
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user