aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2018-12-01 09:42:01 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2018-12-01 09:42:01 +0100
commit7f11e32c394e3e232487896fba022b0e7ab0bf0c (patch)
tree48b9a96a57e711735a53f783fac342f5c94f592f
parent735e291284d39820b160afd8d6af04e1ddb2da44 (diff)
downloadman-pages-7f11e32c394e3e232487896fba022b0e7ab0bf0c.tar.gz
accept.2, copy_file_range.2, eventfd.2, inotify_init.2, pipe.2, readahead.2, signalfd.2, socket.2, timerfd_create.2: Clarify the distinction between "file descriptor" and "file description"
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man2/accept.24
-rw-r--r--man2/copy_file_range.24
-rw-r--r--man2/eventfd.24
-rw-r--r--man2/inotify_init.24
-rw-r--r--man2/pipe.23
-rw-r--r--man2/readahead.22
-rw-r--r--man2/signalfd.24
-rw-r--r--man2/socket.24
-rw-r--r--man2/timerfd_create.24
9 files changed, 24 insertions, 9 deletions
diff --git a/man2/accept.2 b/man2/accept.2
index aee2bf5a8f..3c6b276e0e 100644
--- a/man2/accept.2
+++ b/man2/accept.2
@@ -151,7 +151,9 @@ to obtain different behavior:
.B SOCK_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/copy_file_range.2 b/man2/copy_file_range.2
index 20374abb21..9bb1813ee8 100644
--- a/man2/copy_file_range.2
+++ b/man2/copy_file_range.2
@@ -100,7 +100,9 @@ is not open for reading; or
is not open for writing; or
the
.B O_APPEND
-flag is set for the open file description referred to by
+flag is set for the open file description (see
+.BR open (2))
+referred to by the file descriptor
.IR fd_out .
.TP
.B EFBIG
diff --git a/man2/eventfd.2 b/man2/eventfd.2
index a17acaa444..185778ab71 100644
--- a/man2/eventfd.2
+++ b/man2/eventfd.2
@@ -60,7 +60,9 @@ for reasons why this may be useful.
.BR EFD_NONBLOCK " (since Linux 2.6.27)"
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/inotify_init.2 b/man2/inotify_init.2
index 29bbe8ebbc..6ad994b93a 100644
--- a/man2/inotify_init.2
+++ b/man2/inotify_init.2
@@ -57,7 +57,9 @@ to obtain different behavior:
.B IN_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/pipe.2 b/man2/pipe.2
index c74d0ff360..fcae8c0ab3 100644
--- a/man2/pipe.2
+++ b/man2/pipe.2
@@ -134,7 +134,8 @@ setting of a pipe file descriptor using
.B O_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the two new open file descriptions.
+file status flag on the open file descriptions
+referred to by the new file descriptors.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/readahead.2 b/man2/readahead.2
index f7286231e4..d3c3737abe 100644
--- a/man2/readahead.2
+++ b/man2/readahead.2
@@ -60,7 +60,7 @@ equal to
.IR "(offset+count)" .
.BR readahead ()
does not read beyond the end of the file.
-The file offset of the open file description referred to by
+The file offset of the open file description referred to by the file descriptor
.I fd
is left unchanged.
.SH RETURN VALUE
diff --git a/man2/signalfd.2 b/man2/signalfd.2
index 3a78a70409..87a975cc2e 100644
--- a/man2/signalfd.2
+++ b/man2/signalfd.2
@@ -78,7 +78,9 @@ to change the behavior of
.B SFD_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/socket.2 b/man2/socket.2
index b4a5727da0..fed3f4e253 100644
--- a/man2/socket.2
+++ b/man2/socket.2
@@ -258,7 +258,9 @@ to modify the behavior of
.B SOCK_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.
diff --git a/man2/timerfd_create.2 b/man2/timerfd_create.2
index ac89402097..b4e3672fb0 100644
--- a/man2/timerfd_create.2
+++ b/man2/timerfd_create.2
@@ -120,7 +120,9 @@ to change the behavior of
.B TFD_NONBLOCK
Set the
.BR O_NONBLOCK
-file status flag on the new open file description.
+file status flag on the open file description (see
+.BR open (2))
+referred to by the new file descriptor.
Using this flag saves extra calls to
.BR fcntl (2)
to achieve the same result.