about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--manual/llio.texi12
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 67320a445d..7c1cd57ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-26  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #162]
+	* manual/llio.texi (Waiting for I/O): Correct description of read
+	conditions reported by select.
+
 2005-09-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* inet/getnetgrent_r.c (innetgr): Call endfct even if result != 0.
diff --git a/manual/llio.texi b/manual/llio.texi
index 4ac6c5fa4f..863b3b4316 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -1582,11 +1582,13 @@ descriptors are checked to see if they are ready for writing; and the
 conditions.  You can pass a null pointer for any of these arguments if
 you are not interested in checking for that kind of condition.
 
-A file descriptor is considered ready for reading if it is not at end of
-file.  A server socket is considered ready for reading if there is a
-pending connection which can be accepted with @code{accept};
-@pxref{Accepting Connections}.  A client socket is ready for writing when
-its connection is fully established; @pxref{Connecting}.
+A file descriptor is considered ready for reading if a @code{read}
+call will not block.  This usually includes the read offset being at
+the end of the file or there is an error to report.  A server socket
+is considered ready for reading if there is a pending connection which
+can be accepted with @code{accept}; @pxref{Accepting Connections}.  A
+client socket is ready for writing when its connection is fully
+established; @pxref{Connecting}.
 
 ``Exceptional conditions'' does not mean errors---errors are reported
 immediately when an erroneous system call is executed, and do not