summaryrefslogtreecommitdiff
path: root/man2/getrlimit.2
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2008-10-05 05:42:32 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2008-10-05 05:42:32 +0200
commit00e8730f7834bd6904b241318931bf22c1f63d0e (patch)
treea2921e7a4b07d698a566911e24065fca38f28f3b /man2/getrlimit.2
parentf3504b02920b742b8bf838840c495add8f958999 (diff)
getrlimit.2: Reword/relocate discussion of BSD's historical RLIMIT_OFILE
The old sentence sat on its own in an odd place, and anyway the modern BSDs use the name RLIMIT_NOFILE. Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man2/getrlimit.2')
-rw-r--r--man2/getrlimit.29
1 files changed, 4 insertions, 5 deletions
diff --git a/man2/getrlimit.2 b/man2/getrlimit.2
index 0247b4be..ea92a1aa 100644
--- a/man2/getrlimit.2
+++ b/man2/getrlimit.2
@@ -60,7 +60,7 @@
.\" 2005-07-28, mtk, Added descriptions of RLIMIT_NICE and RLIMIT_RTPRIO
.\" 2008-05-07, mtk / Peter Zijlstra, Added description of RLIMIT_RTTIME
.\"
-.TH GETRLIMIT 2 2008-08-26 "Linux" "Linux Programmer's Manual"
+.TH GETRLIMIT 2 2008-10-06 "Linux" "Linux Programmer's Manual"
.SH NAME
getrlimit, setrlimit \- get/set resource limits
.SH SYNOPSIS
@@ -278,6 +278,9 @@ Attempts
etc.)
to exceed this limit yield the error
.BR EMFILE .
+(Historically, this limit was named
+.B RLIMIT_OFILE
+on BSD.)
.TP
.B RLIMIT_NPROC
The maximum number of processes (or, more precisely on Linux, threads)
@@ -352,10 +355,6 @@ Upon reaching this limit, a
signal is generated.
To handle this signal, a process must employ an alternate signal stack
.RB ( sigaltstack (2)).
-.PP
-.B RLIMIT_OFILE
-is the BSD name for
-.BR RLIMIT_NOFILE .
.SH "RETURN VALUE"
On success, zero is returned.
On error, \-1 is returned, and