diff options
| author | Chad Loder <cloder@cvs.openbsd.org> | 2005-02-25 03:12:45 +0000 |
|---|---|---|
| committer | Chad Loder <cloder@cvs.openbsd.org> | 2005-02-25 03:12:45 +0000 |
| commit | 8e555d953d4a7e8702ccb2d29b39ad91d179ce95 (patch) | |
| tree | 6c0a9ec621640942bf2aabca87382a65abb1cd77 | |
| parent | 8dcf2d1387109e43cabbf8b12a6bf3dd3ed2613d (diff) | |
Be correct in our man pages when talking about NUL termination (that is,
termination with '\0') vs. null termination.
Input from krw@, jaredy@, jmc@. OK deraadt@
43 files changed, 108 insertions, 108 deletions
diff --git a/lib/libc/crypt/crypt.3 b/lib/libc/crypt/crypt.3 index 9908750f076..2bc03fdd41a 100644 --- a/lib/libc/crypt/crypt.3 +++ b/lib/libc/crypt/crypt.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: crypt.3,v 1.22 2004/04/06 11:00:32 djm Exp $ +.\" $OpenBSD: crypt.3,v 1.23 2005/02/25 03:12:43 cloder Exp $ .\" .\" FreeSec: libcrypt .\" @@ -72,7 +72,7 @@ stronger hashing algorithms. The first argument to .Fn crypt is a -.Dv null Ns -terminated +.Dv NUL Ns -terminated string, typically a user's typed password. The second is in one of three forms: if it begins with an underscore @@ -198,8 +198,8 @@ The DES key is used to encrypt a 64-bit constant using iterations of .Tn DES . The value returned is a -.Dv null Ns -terminated -string, 20 or 13 bytes (plus null) in length, consisting of the +.Dv NUL Ns -terminated +string, 20 or 13 bytes (plus NUL) in length, consisting of the .Ar setting followed by the encoded 64-bit encryption. .Pp diff --git a/lib/libc/gen/authenticate.3 b/lib/libc/gen/authenticate.3 index f690610b66a..1b564df4028 100644 --- a/lib/libc/gen/authenticate.3 +++ b/lib/libc/gen/authenticate.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: authenticate.3,v 1.7 2003/05/30 14:00:32 jmc Exp $ +.\" $OpenBSD: authenticate.3,v 1.8 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. .\" @@ -269,9 +269,9 @@ should be used to determine the outcome of the authentication request. .Pp The .Fn auth_mkvalue -function takes a null terminated string pointed to by +function takes a NUL-terminated string pointed to by .Ar value -and returns a null terminated string suitable for passing +and returns a NUL-terminated string suitable for passing back to a calling program on the back channel. This function is for use by the login scripts themselves. The string returned should be freed by diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3 index 1ebcd7c41e6..260cfe7b445 100644 --- a/lib/libc/gen/confstr.3 +++ b/lib/libc/gen/confstr.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: confstr.3,v 1.13 2004/04/16 10:48:39 jmc Exp $ +.\" $OpenBSD: confstr.3,v 1.14 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -68,7 +68,7 @@ has a value; up to .Fa len \- 1 bytes of the value are copied into the buffer .Fa buf . -The copied value is always null terminated. +The copied value is always NUL terminated. .Pp The available values are as follows: .Bl -tag -width "123456" diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3 index 8c53eac70fa..febeed692b0 100644 --- a/lib/libc/gen/exec.3 +++ b/lib/libc/gen/exec.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: exec.3,v 1.16 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: exec.3,v 1.17 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -77,7 +77,7 @@ functions can be thought of as \&..., .Fa argn . Together they describe a list of one or more pointers to -null-terminated +NUL-terminated strings that represent the argument list available to the executed program. The first argument, by convention, should point to the file name associated with the file being executed. @@ -90,7 +90,7 @@ The and .Fn execvp functions provide an array of pointers to -null-terminated strings that +NUL-terminated strings that represent the argument list available to the new program. The first argument, by convention, should point to the file name associated with the file being executed. @@ -106,7 +106,7 @@ pointer that terminates the list of arguments in the parameter list or the pointer to the .Va argv array with an additional parameter. -This additional parameter is an array of pointers to null-terminated +This additional parameter is an array of pointers to NUL-terminated strings and .Em must be terminated by a null pointer itself. diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3 index 46b14e9e610..e4c0e8ab8e7 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fts.3,v 1.19 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: fts.3,v 1.20 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1989, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -319,7 +319,7 @@ Therefore, the .Fa fts_path and .Fa fts_accpath -fields are guaranteed to be null terminated +fields are guaranteed to be NUL terminated .Em only for the file most recently returned by .Fn fts_read . @@ -336,7 +336,7 @@ Any such modifications should be undone before further calls to are attempted. The .Fa fts_name -field is always null terminated. +field is always NUL terminated. .Ss FTS_OPEN The .Fn fts_open diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3 index 876b1b53df2..0d8857128f7 100644 --- a/lib/libc/gen/getbsize.3 +++ b/lib/libc/gen/getbsize.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getbsize.3,v 1.7 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: getbsize.3,v 1.8 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -48,14 +48,14 @@ for details on its use and format. .Pp The .Fn getbsize -function returns a pointer to a null-terminated +function returns a pointer to a NUL-terminated string describing the block size, something like .Qq 1K-blocks . The memory referenced by .Fa headerlenp is filled in with the length of the string (not including the -terminating null byte). +terminating NUL byte). The memory referenced by .Fa blocksizep is filled in with the block size, in bytes. diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3 index fa6429a3f46..188b9c01783 100644 --- a/lib/libc/gen/getcap.3 +++ b/lib/libc/gen/getcap.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getcap.3,v 1.27 2004/04/16 10:48:39 jmc Exp $ +.\" $OpenBSD: getcap.3,v 1.28 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -197,7 +197,7 @@ retrieves the value of the string capability .Fa cap from the capability record pointed to by .Fa buf . -A pointer to a decoded, null-terminated, +A pointer to a decoded, NUL-terminated, .Xr malloc Ns \&'d copy of the string is returned in the .Ft char * diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3 index b07bb0679de..b3e0831e4d1 100644 --- a/lib/libc/gen/getdomainname.3 +++ b/lib/libc/gen/getdomainname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getdomainname.3,v 1.20 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: getdomainname.3,v 1.21 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -52,7 +52,7 @@ specifies the size of the .Fa name array. If insufficient space is provided, the returned name is truncated. -The returned name is always null terminated. +The returned name is always NUL terminated. .Pp .Fn setdomainname sets the domain name of the host machine to be diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3 index e5bd6609280..5db7efcb0fc 100644 --- a/lib/libc/gen/gethostname.3 +++ b/lib/libc/gen/gethostname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: gethostname.3,v 1.19 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: gethostname.3,v 1.20 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -52,7 +52,7 @@ specifies the size of the .Fa name array. If insufficient space is provided, the returned name is truncated. -The returned name is always null terminated. +The returned name is always NUL terminated. .Pp .Fn sethostname sets the name of the host machine to be diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3 index 31a586b4960..6ae08359ee3 100644 --- a/lib/libc/gen/getpass.3 +++ b/lib/libc/gen/getpass.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getpass.3,v 1.11 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: getpass.3,v 1.12 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -66,7 +66,7 @@ space. .Sh RETURN VALUES Upon successful completion, .Fn getpass -returns a pointer to a null-terminated string of at most +returns a pointer to a NUL-terminated string of at most .Dv _PASSWORD_LEN characters. If an error is encountered, the terminal state is restored and diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3 index 0300d711144..1215be9d0c1 100644 --- a/lib/libc/gen/popen.3 +++ b/lib/libc/gen/popen.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: popen.3,v 1.12 2003/06/02 20:18:34 millert Exp $ +.\" $OpenBSD: popen.3,v 1.13 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -54,7 +54,7 @@ the resulting stream is correspondingly read-only or write-only. .Pp The .Fa command -argument is a pointer to a null-terminated +argument is a pointer to a NUL-terminated string containing a shell command line. This command is passed to .Pa /bin/sh @@ -63,7 +63,7 @@ using the flag; interpretation, if any, is performed by the shell. The .Fa type -argument is a pointer to a null-terminated +argument is a pointer to a NUL-terminated string which must be either .Qq r for reading diff --git a/lib/libc/gen/readpassphrase.3 b/lib/libc/gen/readpassphrase.3 index 029fa07fa86..f078d0abdfb 100644 --- a/lib/libc/gen/readpassphrase.3 +++ b/lib/libc/gen/readpassphrase.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: readpassphrase.3,v 1.14 2004/04/16 10:48:39 jmc Exp $ +.\" $OpenBSD: readpassphrase.3,v 1.15 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -68,7 +68,7 @@ space. .Sh RETURN VALUES Upon successful completion, .Fn readpassphrase -returns a pointer to the null-terminated passphrase. +returns a pointer to the NUL-terminated passphrase. If an error is encountered, the terminal state is restored and a null pointer is returned. .Sh FILES diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3 index 96b0ae10db6..ff459273c22 100644 --- a/lib/libc/gen/ttyname.3 +++ b/lib/libc/gen/ttyname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ttyname.3,v 1.14 2003/06/02 20:18:35 millert Exp $ +.\" $OpenBSD: ttyname.3,v 1.15 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -78,7 +78,7 @@ functions get the related device name of a file descriptor for which is true. The .Fn ttyname_r -function stores the null-terminated +function stores the NUL-terminated pathname of the terminal associated with the file descriptor .Fa fd @@ -101,7 +101,7 @@ The .Fn ttyname and .Fn ttyname_r -functions return the null-terminated name if the device is found and +functions return the NUL-terminated name if the device is found and .Fn isatty is true; otherwise a null pointer is returned and diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3 index fc196d1b7c7..c069b753f3c 100644 --- a/lib/libc/gen/uname.3 +++ b/lib/libc/gen/uname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uname.3,v 1.10 2003/06/02 20:18:35 millert Exp $ +.\" $OpenBSD: uname.3,v 1.11 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -40,7 +40,7 @@ .Sh DESCRIPTION The .Fn uname -function stores null-terminated strings of information identifying +function stores NUL-terminated strings of information identifying the current system into the structure referenced by .Fa name . .Pp diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3 index 67fa8b55ef2..54ed818d507 100644 --- a/lib/libc/gen/vis.3 +++ b/lib/libc/gen/vis.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: vis.3,v 1.19 2003/06/02 20:18:35 millert Exp $ +.\" $OpenBSD: vis.3,v 1.20 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -57,7 +57,7 @@ a string which represents the character If .Fa c needs no encoding, it is copied in unaltered. -The string is null terminated and a pointer to the end of the string is +The string is NUL terminated and a pointer to the end of the string is returned. The maximum length of any encoding is four characters (not including the trailing NUL); diff --git a/lib/libc/net/getrrsetbyname.3 b/lib/libc/net/getrrsetbyname.3 index 65a46357249..621ff31b815 100644 --- a/lib/libc/net/getrrsetbyname.3 +++ b/lib/libc/net/getrrsetbyname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getrrsetbyname.3,v 1.12 2004/07/10 05:34:21 jakob Exp $ +.\" $OpenBSD: getrrsetbyname.3,v 1.13 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (C) 2000, 2001 Internet Software Consortium. .\" @@ -36,7 +36,7 @@ gets a set of resource records associated with a and .Fa rdtype . .Fa hostname -is a pointer a to null-terminated string. +is a pointer to a NUL-terminated string. The .Fa flags field is currently unused and must be zero. diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3 index 30293dcdf2d..e7bfde4900f 100644 --- a/lib/libc/net/if_indextoname.3 +++ b/lib/libc/net/if_indextoname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: if_indextoname.3,v 1.7 2003/08/08 09:26:02 jmc Exp $ +.\" $OpenBSD: if_indextoname.3,v 1.8 2005/02/25 03:12:43 cloder Exp $ .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -72,7 +72,7 @@ returned. .Pf ( Dv IF_NAMESIZE is also defined in .Aq Pa net/if.h -and its value includes a terminating null byte at the end of the +and its value includes a terminating NUL byte at the end of the interface name.) This pointer is also the return value of the function. If there is no interface corresponding to the specified index, @@ -90,7 +90,7 @@ and is as follows: .Bd -literal -offset struct if_nameindex { unsigned int if_index; /* 1, 2, ... */ - char *if_name; /* null terminated name: "le0", ... */ + char *if_name; /* NUL-terminated name: "le0", ... */ }; .Ed .Pp diff --git a/lib/libc/net/link_addr.3 b/lib/libc/net/link_addr.3 index b34afafc7eb..0f8787e1914 100644 --- a/lib/libc/net/link_addr.3 +++ b/lib/libc/net/link_addr.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: link_addr.3,v 1.9 2004/07/15 23:40:39 jmc Exp $ +.\" $OpenBSD: link_addr.3,v 1.10 2005/02/25 03:12:43 cloder Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -90,7 +90,7 @@ represents an Ethernet address to be transmitted on the first Lance Ethernet interface. .Sh RETURN VALUES .Fn link_ntoa -always returns a null-terminated string. +always returns a NUL-terminated string. .Fn link_addr has no return value. (See diff --git a/lib/libc/ohash/ohash_init.3 b/lib/libc/ohash/ohash_init.3 index 35144ebe6b4..5d572d13f26 100644 --- a/lib/libc/ohash/ohash_init.3 +++ b/lib/libc/ohash/ohash_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ohash_init.3,v 1.9 2004/06/22 20:00:16 espie Exp $ +.\" $OpenBSD: ohash_init.3,v 1.10 2005/02/25 03:12:43 cloder Exp $ .\" Copyright (c) 1999 Marc Espie <espie@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -58,7 +58,7 @@ the usual hash table functions. They provide storage and retrieval of records indexed by keys, where a key is a contiguous sequence of bytes at a fixed position in each record. -Keys can either be null-terminated strings or fixed-size memory areas. +Keys can either be NUL-terminated strings or fixed-size memory areas. All functions take a pointer to an ohash structure as the .Fa h function argument. @@ -112,7 +112,7 @@ and .Fa end , exclusive, though the actual elements stored in the table should only contain -null-terminated keys. +NUL-terminated keys. .Pp .Fn ohash_lookup_memory assumes the key is the memory area starting at diff --git a/lib/libc/ohash/ohash_interval.3 b/lib/libc/ohash/ohash_interval.3 index 386f4dc31d5..0f84760e5f3 100644 --- a/lib/libc/ohash/ohash_interval.3 +++ b/lib/libc/ohash/ohash_interval.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ohash_interval.3,v 1.8 2004/10/04 13:47:00 espie Exp $ +.\" $OpenBSD: ohash_interval.3,v 1.9 2005/02/25 03:12:43 cloder Exp $ .\" Copyright (c) 2001 Marc Espie <espie@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -37,7 +37,7 @@ .Sh DESCRIPTION These functions are commonly used to simplify open hashing usage, and use similar conventions. -They operate indifferently on null-terminated strings +They operate indifferently on NUL-terminated strings .Po by setting .Fa *pend @@ -51,10 +51,10 @@ delimited by and .Fa *pend .Pc . -For null-terminated strings, as a side effect, those functions +For NUL-terminated strings, as a side effect, those functions set .Fa *pend -to the terminating null byte. +to the terminating NUL byte. .Pp .Fn ohash_interval is a simple hashing function that yields good results on common data sets. @@ -77,7 +77,7 @@ and .Fn ohash_qlookup is a variation on .Fn ohash_qlookupi -designed for null-terminated strings. +designed for NUL-terminated strings. .Sh SEE ALSO .Xr ohash_init 3 .Sh STANDARDS diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3 index f7e080b610b..cd1c146d0fc 100644 --- a/lib/libc/regex/regex.3 +++ b/lib/libc/regex/regex.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: regex.3,v 1.19 2004/02/10 19:58:21 jmc Exp $ +.\" $OpenBSD: regex.3,v 1.20 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved. .\" @@ -213,7 +213,7 @@ The compiled form is not altered during execution of so a single compiled RE can be used simultaneously by multiple threads. .Pp By default, -the null-terminated string pointed to by +the NUL-terminated string pointed to by .Fa string is considered to be the text of an entire line, minus any terminating newline. @@ -399,7 +399,7 @@ may be able to supply a more detailed message using information from the .Li regex_t . ) .Fn regerror -places the null-terminated message into the buffer pointed to by +places the NUL-terminated message into the buffer pointed to by .Fa errbuf , limiting the length (including the NUL) to at most .Fa errbuf_size diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3 index 78a96dc6ed4..430599bcda1 100644 --- a/lib/libc/stdio/fgetln.3 +++ b/lib/libc/stdio/fgetln.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fgetln.3,v 1.11 2004/08/20 18:17:35 millert Exp $ +.\" $OpenBSD: fgetln.3,v 1.12 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -117,7 +117,7 @@ The function first appeared in .Bx 4.4 . .Sh CAVEATS -Since the returned buffer is not a C string (it is not null terminated), a +Since the returned buffer is not a C string (it is not NUL terminated), a common practice is to replace the newline character with .Sq \e0 . However, if the last line in a file does not contain a newline, diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3 index e38c6e8b649..f532a4b0927 100644 --- a/lib/libc/stdio/fgets.3 +++ b/lib/libc/stdio/fgets.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fgets.3,v 1.19 2003/06/02 20:18:37 millert Exp $ +.\" $OpenBSD: fgets.3,v 1.20 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -172,7 +172,7 @@ and the program will terminate, even if the line was valid. .It All C string functions, including .Fn strchr , -correctly assume the end of the string is represented by a null +correctly assume the end of the string is represented by a NUL .Pq Sq \e0 character. If the first character of a line returned by diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 4dc381043ef..4931d4e3b3d 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: printf.3,v 1.44 2004/09/18 19:28:06 otto Exp $ +.\" $OpenBSD: printf.3,v 1.45 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -583,7 +583,7 @@ a terminating character; if a precision is specified, no more than the number specified are written. -If a precision is given, no null character +If a precision is given, no NUL character need be present; if the precision is not specified, or is greater than the size of the array, the array must contain a terminating .Tn NUL diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3 index de70d0af714..f2957a7ad42 100644 --- a/lib/libc/stdlib/a64l.3 +++ b/lib/libc/stdlib/a64l.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: a64l.3,v 1.8 2003/06/17 21:56:24 millert Exp $ +.\" $OpenBSD: a64l.3,v 1.9 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -60,7 +60,7 @@ for 38-63. .Pp The .Fn a64l -function takes a pointer to a null-terminated radix-64 representation +function takes a pointer to a NUL-terminated radix-64 representation and returns a corresponding 32-bit value. If the string pointed to by .Fa s diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3 index 8513cfb66aa..6cb4975ced1 100644 --- a/lib/libc/stdlib/getsubopt.3 +++ b/lib/libc/stdlib/getsubopt.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getsubopt.3,v 1.8 2004/01/23 23:08:46 jmc Exp $ +.\" $OpenBSD: getsubopt.3,v 1.9 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -78,7 +78,7 @@ On return from .Fn getsubopt , .Fa optionp will be set to point to the start of the next token in the string, -or the null at the end of the string if no more tokens are present. +or the NUL at the end of the string if no more tokens are present. The external variable .Fa suboptarg will be set to point to the start of the current token, or diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3 index d33a3c1e79a..bcb5ac98fc0 100644 --- a/lib/libc/string/bstring.3 +++ b/lib/libc/string/bstring.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: bstring.3,v 1.6 2004/02/10 14:35:35 jmc Exp $ +.\" $OpenBSD: bstring.3,v 1.7 2005/02/25 03:12:44 cloder Exp $ .\" .Dd April 19, 1991 .Dt BSTRING 3 @@ -57,7 +57,7 @@ .Fn memset "void *b" "int c" "size_t len" .Sh DESCRIPTION These functions operate on variable length strings of bytes. -They do not check for terminating null bytes as the routines +They do not check for terminating NUL bytes as the routines listed in .Xr string 3 do. diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3 index e1f5d416d14..c4253e5afd2 100644 --- a/lib/libc/string/strcasecmp.3 +++ b/lib/libc/string/strcasecmp.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: strcasecmp.3,v 1.8 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcasecmp.3,v 1.9 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -49,7 +49,7 @@ The .Fn strcasecmp and .Fn strncasecmp -functions compare the null-terminated strings +functions compare the NUL-terminated strings .Fa s1 and .Fa s2 diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3 index 5b878c3e8c8..89d368c3fb2 100644 --- a/lib/libc/string/strcat.3 +++ b/lib/libc/string/strcat.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strcat.3,v 1.9 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcat.3,v 1.10 2005/02/25 03:12:44 cloder Exp $ .\" .Dd July 8, 1997 .Dt STRCAT 3 @@ -49,9 +49,9 @@ The .Fn strcat and .Fn strncat -functions append a copy of the null-terminated string +functions append a copy of the NUL-terminated string .Fa append -to the end of the null-terminated string +to the end of the NUL-terminated string .Fa s , then add a terminating .Ql \e0 . diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3 index d025b9cf7c1..953181e8de4 100644 --- a/lib/libc/string/strcmp.3 +++ b/lib/libc/string/strcmp.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strcmp.3,v 1.7 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcmp.3,v 1.8 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRCMP 3 @@ -49,7 +49,7 @@ The .Fn strcmp and .Fn strncmp -functions lexicographically compare the null-terminated strings +functions lexicographically compare the NUL-terminated strings .Fa s1 and .Fa s2 . diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3 index fe0ff355101..d1a4e60dc6b 100644 --- a/lib/libc/string/strcoll.3 +++ b/lib/libc/string/strcoll.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strcoll.3,v 1.5 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcoll.3,v 1.6 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRCOLL 3 @@ -44,7 +44,7 @@ .Sh DESCRIPTION The .Fn strcoll -function lexicographically compares the null-terminated strings +function lexicographically compares the NUL-terminated strings .Fa s1 and .Fa s2 diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3 index 8304508df61..504f42f2bae 100644 --- a/lib/libc/string/strcpy.3 +++ b/lib/libc/string/strcpy.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strcpy.3,v 1.12 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcpy.3,v 1.13 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRCPY 3 @@ -98,12 +98,12 @@ to .Dq abcdef and does .Em not -null terminate +NUL terminate .Va chararray because the source string is >= the length parameter. .Fn strncpy .Em only -null terminates the destination string when the length of the source +NUL terminates the destination string when the length of the source string is less than the length parameter. .Bd -literal -offset indent (void)strncpy(chararray, "abcdefgh", 6); @@ -113,12 +113,12 @@ The following copies as many characters from .Va input to .Va buf -as will fit and null terminates the result. +as will fit and NUL terminates the result. Because .Fn strncpy does .Em not -guarantee to null terminate the string itself, we must do this by hand. +guarantee to NUL terminate the string itself, we must do this by hand. .Bd -literal -offset indent char buf[BUFSIZ]; diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3 index 6dfe1b276e6..c28d99a9014 100644 --- a/lib/libc/string/strcspn.3 +++ b/lib/libc/string/strcspn.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strcspn.3,v 1.6 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strcspn.3,v 1.7 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRCSPN 3 @@ -44,7 +44,7 @@ .Sh DESCRIPTION The .Fn strcspn -function spans the initial part of the null-terminated string +function spans the initial part of the NUL-terminated string .Fa s as long as the characters from .Fa s diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3 index 59b77f7a16d..a434312c425 100644 --- a/lib/libc/string/strdup.3 +++ b/lib/libc/string/strdup.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: strdup.3,v 1.12 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strdup.3,v 1.13 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -54,7 +54,7 @@ is returned. .Sh EXAMPLES The following will point .Va p -to an allocated area of memory containing the null-terminated string +to an allocated area of memory containing the NUL-terminated string .Qq foobar : .Bd -literal -offset indent char *p; diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3 index 89034ac24c4..690cf4dbda9 100644 --- a/lib/libc/string/string.3 +++ b/lib/libc/string/string.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: string.3,v 1.10 2004/02/09 20:53:12 jmc Exp $ +.\" $OpenBSD: string.3,v 1.11 2005/02/25 03:12:44 cloder Exp $ .\" .Dd April 19, 1991 .Dt STRING 3 @@ -84,11 +84,11 @@ .Sh DESCRIPTION The string functions manipulate strings terminated by a -null byte. +NUL byte. .Pp See the specific manual pages for more information. For manipulating variable length generic objects as byte -strings (without the null byte check), see +strings (without the NUL-byte check), see .Xr bstring 3 . .Pp Except as noted in their specific manual pages, diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3 index bc45c4ce1f8..3a7a4bb3faf 100644 --- a/lib/libc/string/strmode.3 +++ b/lib/libc/string/strmode.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: strmode.3,v 1.11 2003/09/02 18:24:21 jmc Exp $ +.\" $OpenBSD: strmode.3,v 1.12 2005/02/25 03:12:44 cloder Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -48,7 +48,7 @@ function converts a file .Xr stat 2 ) into a symbolic string which is stored in the location referenced by .Fa bp . -This stored string is eleven characters in length plus a trailing null byte. +This stored string is eleven characters in length plus a trailing NUL byte. .Pp The first character is the inode type, and will be one of the following: .Pp diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3 index 7e54f9de544..e91776a0cad 100644 --- a/lib/libc/string/strpbrk.3 +++ b/lib/libc/string/strpbrk.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strpbrk.3,v 1.6 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strpbrk.3,v 1.7 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRPBRK 3 @@ -44,7 +44,7 @@ .Sh DESCRIPTION The .Fn strpbrk -function locates in the null-terminated string +function locates in the NUL-terminated string .Fa s the first occurrence of any character in the string .Fa charset diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3 index 54077b810cb..5dc7e9746ae 100644 --- a/lib/libc/string/strspn.3 +++ b/lib/libc/string/strspn.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strspn.3,v 1.7 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strspn.3,v 1.8 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRSPN 3 @@ -44,7 +44,7 @@ .Sh DESCRIPTION The .Fn strspn -function spans the initial part of the null-terminated string +function spans the initial part of the NUL-terminated string .Fa s as long as the characters from .Fa s diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3 index 47777dd89f1..64396e7885d 100644 --- a/lib/libc/string/strstr.3 +++ b/lib/libc/string/strstr.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strstr.3,v 1.6 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: strstr.3,v 1.7 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRSTR 3 @@ -44,9 +44,9 @@ .Sh DESCRIPTION The .Fn strstr -function locates the first occurrence of the null-terminated string +function locates the first occurrence of the NUL-terminated string .Fa little -in the null-terminated string +in the NUL-terminated string .Fa big . If .Fa little diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3 index 29eea4847e9..03a93980abf 100644 --- a/lib/libc/string/strtok.3 +++ b/lib/libc/string/strtok.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: strtok.3,v 1.17 2004/01/20 06:06:48 millert Exp $ +.\" $OpenBSD: strtok.3,v 1.18 2005/02/25 03:12:44 cloder Exp $ .\" .Dd June 29, 1991 .Dt STRTOK 3 @@ -52,7 +52,7 @@ This interface is obsoleted by .Pp The .Fn strtok -function is used to isolate sequential tokens in a null-terminated string, +function is used to isolate sequential tokens in a NUL-terminated string, .Fa str . These tokens are separated in the string by at least one of the characters in diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2 index abee854b4d5..80c8f7d3943 100644 --- a/lib/libc/sys/acct.2 +++ b/lib/libc/sys/acct.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: acct.2,v 1.9 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: acct.2,v 1.10 2005/02/25 03:12:44 cloder Exp $ .\" $NetBSD: acct.2,v 1.6 1995/02/27 12:31:47 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -51,7 +51,7 @@ is accounting is disabled. If .Fa file -is an existing, null-terminated pathname, record collection is enabled +is an existing, NUL-terminated pathname, record collection is enabled and for every process initiated which terminates under normal conditions an accounting record is appended to .Fa file . diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2 index 4fc2e838b21..6d020de9526 100644 --- a/lib/libc/sys/execve.2 +++ b/lib/libc/sys/execve.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: execve.2,v 1.29 2004/07/05 23:04:43 jmc Exp $ +.\" $OpenBSD: execve.2,v 1.30 2005/02/25 03:12:44 cloder Exp $ .\" $NetBSD: execve.2,v 1.9 1995/02/27 12:32:25 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -93,7 +93,7 @@ file, is left unchanged. The argument .Fa argv is a pointer to a null-terminated array of -character pointers to nul-terminated character strings. +character pointers to NUL-terminated character strings. These strings construct the argument list to be made available to the new process. At least one argument must be present in the array; @@ -104,7 +104,7 @@ the name of the executed program (for example, the last component of The argument .Fa envp is also a pointer to a null-terminated array of -character pointers to nul-terminated strings. +character pointers to NUL-terminated strings. A pointer to this array is normally stored in the global variable .Va environ . These strings pass information to the diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2 index 81af636237e..3d0e41647e4 100644 --- a/lib/libc/sys/getlogin.2 +++ b/lib/libc/sys/getlogin.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getlogin.2,v 1.16 2003/06/02 20:18:39 millert Exp $ +.\" $OpenBSD: getlogin.2,v 1.17 2005/02/25 03:12:44 cloder Exp $ .\" $NetBSD: getlogin.2,v 1.4 1995/02/27 12:33:03 cgd Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 @@ -133,7 +133,7 @@ precautions to prevent security violations. .Sh RETURN VALUES If a call to .Fn getlogin -succeeds, it returns a pointer to a null-terminated string in a static buffer. +succeeds, it returns a pointer to a NUL-terminated string in a static buffer. If the name has not been set, it returns .Dv NULL . If a call to |