diff options
| author | cgd <cgd@NetBSD.org> | 1995-02-27 12:31:34 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1995-02-27 12:31:34 +0000 |
| commit | 4eab61bd40c07b2fc612ad50cface2b77fc110d0 (patch) | |
| tree | 7118747f1d9919499fdea5d7c6908c5cfe04e5a8 /lib/libc/sys/read.2 | |
| parent | c67e54a2e2b9f3d455a30d68ea4e09e56d7b9136 (diff) | |
merge with lite, keeping most local changes. clean up Ids
Diffstat (limited to 'lib/libc/sys/read.2')
| -rw-r--r-- | lib/libc/sys/read.2 | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2 index 325facb926b..ae4af1357d8 100644 --- a/lib/libc/sys/read.2 +++ b/lib/libc/sys/read.2 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1980, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: read.2,v 1.6 1995/02/27 12:35:47 cgd Exp $ +.\" +.\" Copyright (c) 1980, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)read.2 6.7 (Berkeley) 3/10/91 -.\" $Id: read.2,v 1.5 1994/09/16 03:08:46 mycroft Exp $ +.\" @(#)read.2 8.4 (Berkeley) 2/26/94 .\" -.Dd March 10, 1991 +.Dd February 26, 1994 .Dt READ 2 .Os BSD 4 .Sh NAME @@ -40,13 +41,13 @@ .Nm readv .Nd read input .Sh SYNOPSIS -.Fd #include <unistd.h> .Fd #include <sys/types.h> .Fd #include <sys/uio.h> +.Fd #include <unistd.h> .Ft ssize_t .Fn read "int d" "void *buf" "size_t nbytes" -.Ft int -.Fn readv "int d" "struct iovec *iov" "int iovcnt" +.Ft ssize_t +.Fn readv "int d" "const struct iovec *iov" "int iovcnt" .Sh DESCRIPTION .Fn Read attempts to read @@ -67,11 +68,12 @@ For .Fn readv , the .Fa iovec -structure is defined as +structure is defined as: +.Pp .Bd -literal -offset indent -compact struct iovec { - caddr_t iov_base; - int iov_len; + void *iov_base; + size_t iov_len; }; .Ed .Pp @@ -135,7 +137,7 @@ any data arrived by the delivery of a signal. The pointer associated with .Fa d was negative. -.It Bq Er EWOULDBLOCK +.It Bq Er EAGAIN The file was marked for non-blocking I/O, and no data were ready to be read. .El |
