diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2010-09-19 22:22:14 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2010-09-19 22:22:14 +0000 |
commit | d976731f0e9776d93fbab481527759c521811f19 (patch) | |
tree | 5cc0a4c3377476b62ddd7d59d225ba3682397fd1 /lib | |
parent | 6e2232564ea00cd8c9d91bde36206a701b28e3ab (diff) |
more wacky macro fixing;
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/gen/getloadavg.3 | 6 | ||||
-rw-r--r-- | lib/libc/stdlib/getopt_long.3 | 74 | ||||
-rw-r--r-- | lib/libcompat/regexp/regexp.3 | 8 | ||||
-rw-r--r-- | lib/libkeynote/keynote.3 | 10 | ||||
-rw-r--r-- | lib/libkvm/kvm_getloadavg.3 | 6 |
5 files changed, 52 insertions, 52 deletions
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3 index 9e689297620..a19825115af 100644 --- a/lib/libc/gen/getloadavg.3 +++ b/lib/libc/gen/getloadavg.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getloadavg.3,v 1.10 2007/05/31 19:19:28 jmc Exp $ +.\" $OpenBSD: getloadavg.3,v 1.11 2010/09/19 22:22:13 jmc Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: September 19 2010 $ .Dt GETLOADAVG 3 .Os .Sh NAME @@ -45,7 +45,7 @@ averaged over various periods of time. Up to .Fa nelem samples are retrieved and assigned to successive elements of -.Fa loadavg Ns Bq . +.Fa loadavg Ns \(sq . The system imposes a maximum of 3 samples, representing averages over the last 1, 5, and 15 minutes, respectively. .Sh RETURN VALUES diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3 index 2bab9637341..53737d8f257 100644 --- a/lib/libc/stdlib/getopt_long.3 +++ b/lib/libc/stdlib/getopt_long.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getopt_long.3,v 1.15 2007/07/03 12:06:07 jmc Exp $ +.\" $OpenBSD: getopt_long.3,v 1.16 2010/09/19 22:22:13 jmc Exp $ .\" $NetBSD: getopt_long.3,v 1.11 2002/10/02 10:54:19 wiz Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)getopt.3 8.5 (Berkeley) 4/27/95 .\" -.Dd $Mdocdate: July 3 2007 $ +.Dd $Mdocdate: September 19 2010 $ .Dt GETOPT_LONG 3 .Os .Sh NAME @@ -204,41 +204,6 @@ if there was a missing option argument, .Sq \&? if the user specified an unknown or ambiguous option, and \-1 when the argument list has been exhausted. -.Sh EXAMPLES -.Bd -literal -int bflag, ch, fd; -int daggerset; - -/* options descriptor */ -static struct option longopts[] = { - { "buffy", no_argument, NULL, 'b' }, - { "fluoride", required_argument, NULL, 'f' }, - { "daggerset", no_argument, &daggerset, 1 }, - { NULL, 0, NULL, 0 } -}; - -bflag = 0; -while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1) - switch (ch) { - case 'b': - bflag = 1; - break; - case 'f': - if ((fd = open(optarg, O_RDONLY, 0)) == -1) - err(1, "unable to open %s", optarg); - break; - case 0: - if (daggerset) - fprintf(stderr, "Buffy will use her dagger to " - "apply fluoride to dracula's teeth\en"); - break; - default: - usage(); - /* NOTREACHED */ - } -argc -= optind; -argv += optind; -.Ed .Sh IMPLEMENTATION DIFFERENCES This section describes differences to the GNU implementation found in glibc-2.1.3: @@ -444,6 +409,41 @@ in the .Ar optstring is ignored. .El +.Sh EXAMPLES +.Bd -literal +int bflag, ch, fd; +int daggerset; + +/* options descriptor */ +static struct option longopts[] = { + { "buffy", no_argument, NULL, 'b' }, + { "fluoride", required_argument, NULL, 'f' }, + { "daggerset", no_argument, &daggerset, 1 }, + { NULL, 0, NULL, 0 } +}; + +bflag = 0; +while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1) + switch (ch) { + case 'b': + bflag = 1; + break; + case 'f': + if ((fd = open(optarg, O_RDONLY, 0)) == -1) + err(1, "unable to open %s", optarg); + break; + case 0: + if (daggerset) + fprintf(stderr, "Buffy will use her dagger to " + "apply fluoride to dracula's teeth\en"); + break; + default: + usage(); + /* NOTREACHED */ + } +argc -= optind; +argv += optind; +.Ed .Sh SEE ALSO .Xr getopt 3 .Sh HISTORY diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3 index 4f8a9ace87d..d1e2e99e71d 100644 --- a/lib/libcompat/regexp/regexp.3 +++ b/lib/libcompat/regexp/regexp.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: regexp.3,v 1.10 2007/05/31 19:19:34 jmc Exp $ +.\" $OpenBSD: regexp.3,v 1.11 2010/09/19 22:22:13 jmc Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -28,7 +28,7 @@ .\" .\" @(#)regexp.3 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: September 19 2010 $ .Dt REGEXP 3 .Os .Sh NAME @@ -137,9 +137,9 @@ Each instance of `&' in .Fa source is replaced by the substring indicated by -.Em startp Ns Bq +.Em startp Ns \(sq and -.Em endp Ns Bq . +.Em endp Ns \(sq . Each instance of .Sq \e Ns Em n , where diff --git a/lib/libkeynote/keynote.3 b/lib/libkeynote/keynote.3 index 5b1d4df192e..b8b6622568a 100644 --- a/lib/libkeynote/keynote.3 +++ b/lib/libkeynote/keynote.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: keynote.3,v 1.40 2007/08/03 08:09:37 hshoexer Exp $ +.\" $OpenBSD: keynote.3,v 1.41 2010/09/19 22:22:13 jmc Exp $ .\" .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) .\" @@ -20,7 +20,7 @@ .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR .\" PURPOSE. .\" -.Dd $Mdocdate: August 3 2007 $ +.Dd $Mdocdate: September 19 2010 $ .Dt KEYNOTE 3 .\" .TH KeyNote 3 local .Os @@ -865,6 +865,9 @@ is returned. .It Pa keynote.h .It Pa libkeynote.a .El +.Sh DIAGNOSTICS +The return values of all the functions have been given along with the +function description above. .Sh SEE ALSO .Xr keynote 1 , .Xr keynote 4 , @@ -897,9 +900,6 @@ is returned. .An Angelos D. Keromytis Aq angelos@cs.columbia.edu .Sh WEB PAGE .Pa http://www1.cs.columbia.edu/~angelos/keynote.html -.Sh DIAGNOSTICS -The return values of all the functions have been given along with the -function description above. .Sh BUGS None that we know of. If you find any, please report them to diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3 index 930e3934925..57b42ca08fa 100644 --- a/lib/libkvm/kvm_getloadavg.3 +++ b/lib/libkvm/kvm_getloadavg.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kvm_getloadavg.3,v 1.8 2007/05/31 19:19:35 jmc Exp $ +.\" $OpenBSD: kvm_getloadavg.3,v 1.9 2010/09/19 22:22:13 jmc Exp $ .\" $NetBSD: kvm_getloadavg.3,v 1.2 1996/03/18 22:33:26 thorpej Exp $ .\" .\" Copyright (c) 1992, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)kvm_getloadavg.3 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: September 19 2010 $ .Dt KVM_GETLOADAVG 3 .Os .Sh NAME @@ -51,7 +51,7 @@ averaged over various periods of time. Up to .Fa nelem samples are retrieved and assigned to successive elements of -.Fa loadavg Ns Bq . +.Fa loadavg Ns \(sq . The system imposes a maximum of 3 samples, representing averages over the last 1, 5, and 15 minutes, respectively. .Sh RETURN VALUES |