From 4ec5da8bd216e42ce3d182eb511b7d0f79918037 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Wed, 5 Jun 2013 03:40:26 +0000 Subject: [PATCH] use fancy .In macro for includes. from Jan Klemkow. ok jmc schwarze --- src/lib/libutil/check_expire.3 | 8 ++++---- src/lib/libutil/fmt_scaled.3 | 6 +++--- src/lib/libutil/fparseln.3 | 8 ++++---- src/lib/libutil/getmaxpartitions.3 | 6 +++--- src/lib/libutil/getrawpartition.3 | 6 +++--- src/lib/libutil/imsg_init.3 | 12 ++++++------ src/lib/libutil/isduid.3 | 6 +++--- src/lib/libutil/login.3 | 8 ++++---- src/lib/libutil/login_fbtab.3 | 8 ++++---- src/lib/libutil/opendev.3 | 6 +++--- src/lib/libutil/opendisk.3 | 8 ++++---- src/lib/libutil/openpty.3 | 8 ++++---- src/lib/libutil/pidfile.3 | 6 +++--- src/lib/libutil/pkcs5_pbkdf2.3 | 6 +++--- src/lib/libutil/pw_init.3 | 8 ++++---- src/lib/libutil/pw_lock.3 | 6 +++--- src/lib/libutil/readlabelfs.3 | 6 +++--- src/lib/libutil/uucplock.3 | 8 ++++---- 18 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/lib/libutil/check_expire.3 b/src/lib/libutil/check_expire.3 index 6d03ad14..b033bb9a 100644 --- a/src/lib/libutil/check_expire.3 +++ b/src/lib/libutil/check_expire.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: check_expire.3,v 1.7 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: check_expire.3,v 1.8 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 2000 Todd C. Miller .\" @@ -14,15 +14,15 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt CHECK_EXPIRE 3 .Os .Sh NAME .Nm check_expire .Nd check for password expiration .Sh SYNOPSIS -.Fd #include -.Fd #include +.In stdio.h +.In util.h .Ft int .Fn login_check_expire "FILE *back" "struct passwd *pwd" "char *class" "int lastchance" .Sh DESCRIPTION diff --git a/src/lib/libutil/fmt_scaled.3 b/src/lib/libutil/fmt_scaled.3 index ebc94968..3da90317 100644 --- a/src/lib/libutil/fmt_scaled.3 +++ b/src/lib/libutil/fmt_scaled.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fmt_scaled.3,v 1.5 2008/07/29 13:53:14 jmc Exp $ +.\" $OpenBSD: fmt_scaled.3,v 1.6 2013/06/05 03:40:26 tedu Exp $ .\" Copyright (c) 2001, 2003 Ian Darwin. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 29 2008 $ +.Dd $Mdocdate: June 5 2013 $ .Dt FMT_SCALED 3 .Os .Sh NAME @@ -31,7 +31,7 @@ .Nm scan_scaled .Nd handle numbers with a human-readable scale .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn scan_scaled "char *number_w_scale" "long long *result" .Ft int diff --git a/src/lib/libutil/fparseln.3 b/src/lib/libutil/fparseln.3 index 2655102a..fa9c209c 100644 --- a/src/lib/libutil/fparseln.3 +++ b/src/lib/libutil/fparseln.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fparseln.3,v 1.7 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: fparseln.3,v 1.8 2013/06/05 03:40:26 tedu Exp $ .\" $NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $ .\" .\" Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -28,15 +28,15 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt FPARSELN 3 .Os .Sh NAME .Nm fparseln .Nd return the next logical line from a stream .Sh SYNOPSIS -.Fd #include -.Fd #include +.In stdio.h +.In util.h .Ft "char *" .Fo "fparseln" .Fa "FILE *stream" "size_t *len" "size_t *lineno" diff --git a/src/lib/libutil/getmaxpartitions.3 b/src/lib/libutil/getmaxpartitions.3 index 535b03dd..f9e2b297 100644 --- a/src/lib/libutil/getmaxpartitions.3 +++ b/src/lib/libutil/getmaxpartitions.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getmaxpartitions.3,v 1.5 2008/06/26 05:42:05 ray Exp $ +.\" $OpenBSD: getmaxpartitions.3,v 1.6 2013/06/05 03:40:26 tedu Exp $ .\" $NetBSD: getmaxpartitions.3,v 1.1 1996/05/16 07:03:30 thorpej Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,14 +28,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: June 5 2013 $ .Dt GETMAXPARTITIONS 3 .Os .Sh NAME .Nm getmaxpartitions .Nd get the maximum number of partitions allowed per disk .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn getmaxpartitions void .Sh DESCRIPTION diff --git a/src/lib/libutil/getrawpartition.3 b/src/lib/libutil/getrawpartition.3 index 6003661d..c0a0b842 100644 --- a/src/lib/libutil/getrawpartition.3 +++ b/src/lib/libutil/getrawpartition.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getrawpartition.3,v 1.6 2008/06/26 05:42:05 ray Exp $ +.\" $OpenBSD: getrawpartition.3,v 1.7 2013/06/05 03:40:26 tedu Exp $ .\" $NetBSD: getrawpartition.3,v 1.1 1996/05/16 07:03:32 thorpej Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: June 5 2013 $ .Dt GETRAWPARTITION 3 .Os .Sh NAME @@ -37,7 +37,7 @@ .Dq raw partition .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn getrawpartition void .Sh DESCRIPTION diff --git a/src/lib/libutil/imsg_init.3 b/src/lib/libutil/imsg_init.3 index ba0f2dbe..19320b8e 100644 --- a/src/lib/libutil/imsg_init.3 +++ b/src/lib/libutil/imsg_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: imsg_init.3,v 1.8 2012/11/15 15:31:36 krw Exp $ +.\" $OpenBSD: imsg_init.3,v 1.9 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 2010 Nicholas Marriott .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 15 2012 $ +.Dd $Mdocdate: June 5 2013 $ .Dt IMSG_INIT 3 .Os .Sh NAME @@ -45,10 +45,10 @@ .Nm msgbuf_drain .Nd IPC messaging functions .Sh SYNOPSIS -.Fd #include -.Fd #include -.Fd #include -.Fd #include +.In sys/types.h +.In sys/queue.h +.In sys/uio.h +.In imsg.h .Ft void .Fn imsg_init "struct imsgbuf *ibuf" "int fd" .Ft ssize_t diff --git a/src/lib/libutil/isduid.3 b/src/lib/libutil/isduid.3 index f7248a51..36148eee 100644 --- a/src/lib/libutil/isduid.3 +++ b/src/lib/libutil/isduid.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isduid.3,v 1.1 2010/11/17 10:10:31 jsing Exp $ +.\" $OpenBSD: isduid.3,v 1.2 2013/06/05 03:40:26 tedu Exp $ .\" .\" * Copyright (c) Joel Sing .\" @@ -14,14 +14,14 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 17 2010 $ +.Dd $Mdocdate: June 5 2013 $ .Dt ISDUID 3 .Os .Sh NAME .Nm isduid .Nd disklabel UID test .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn isduid "char *duid" "int dflags" .Sh DESCRIPTION diff --git a/src/lib/libutil/login.3 b/src/lib/libutil/login.3 index 067845be..06c2cfaf 100644 --- a/src/lib/libutil/login.3 +++ b/src/lib/libutil/login.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: login.3,v 1.5 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: login.3,v 1.6 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt LOGIN 3 .Os .Sh NAME @@ -40,8 +40,8 @@ .Nm logwtmp .Nd login utility functions .Sh SYNOPSIS -.Fd #include -.Fd #include +.In utmp.h +.In util.h .Ft void .Fn login "struct utmp *ut" .Ft int diff --git a/src/lib/libutil/login_fbtab.3 b/src/lib/libutil/login_fbtab.3 index 67c6a94d..6f019947 100644 --- a/src/lib/libutil/login_fbtab.3 +++ b/src/lib/libutil/login_fbtab.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: login_fbtab.3,v 1.10 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: login_fbtab.3,v 1.11 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright 1995 by Wietse Venema. All rights reserved. Some individual .\" files may be covered by other copyrights. @@ -15,7 +15,7 @@ .\" warranties, including, without limitation, the implied warranties of .\" merchantibility and fitness for any particular purpose. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt LOGIN_FBTAB 3 .Os .Sh NAME @@ -23,8 +23,8 @@ .Nd implement device security based on .Pa /etc/fbtab .Sh SYNOPSIS -.Fd #include -.Fd #include +.In sys/types.h +.In util.h .Ft void .Fn login_fbtab "const char *tty" "uid_t uid" "gid_t gid" .Sh DESCRIPTION diff --git a/src/lib/libutil/opendev.3 b/src/lib/libutil/opendev.3 index ce4eb3fa..29045df1 100644 --- a/src/lib/libutil/opendev.3 +++ b/src/lib/libutil/opendev.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: opendev.3,v 1.20 2011/01/03 14:26:51 krw Exp $ +.\" $OpenBSD: opendev.3,v 1.21 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 2000, Todd C. Miller. All rights reserved. .\" Copyright (c) 1996, Jason Downs. All rights reserved. @@ -24,14 +24,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 3 2011 $ +.Dd $Mdocdate: June 5 2013 $ .Dt OPENDEV 3 .Os .Sh NAME .Nm opendev .Nd short form device open routine .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn opendev "const char *path" "int oflags" "int dflags" "char **realpath" .Sh DESCRIPTION diff --git a/src/lib/libutil/opendisk.3 b/src/lib/libutil/opendisk.3 index 668fee7f..92c8a6c5 100644 --- a/src/lib/libutil/opendisk.3 +++ b/src/lib/libutil/opendisk.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: opendisk.3,v 1.6 2009/09/29 12:56:15 jmc Exp $ +.\" $OpenBSD: opendisk.3,v 1.7 2013/06/05 03:40:26 tedu Exp $ .\" $NetBSD: opendisk.3,v 1.4 1999/07/02 15:49:12 simonb Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 29 2009 $ +.Dd $Mdocdate: June 5 2013 $ .Dt OPENDISK 3 .Os .Sh NAME @@ -37,8 +37,8 @@ .Dq raw partition .Sh SYNOPSIS -.Fd #include -.Fd #include +.In sys/types.h +.In util.h .Ft int .Fo opendisk .Fa "const char *path" diff --git a/src/lib/libutil/openpty.3 b/src/lib/libutil/openpty.3 index 5631236f..562e89c9 100644 --- a/src/lib/libutil/openpty.3 +++ b/src/lib/libutil/openpty.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: openpty.3,v 1.15 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: openpty.3,v 1.16 2013/06/05 03:40:26 tedu Exp $ .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. .\" @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt OPENPTY 3 .Os .Sh NAME @@ -39,8 +39,8 @@ .Nm forkpty .Nd tty utility functions .Sh SYNOPSIS -.Fd #include -.Fd #include +.In termios.h +.In util.h .Ft int .Fn openpty "int *amaster" "int *aslave" "char *name" "struct termios *termp" "struct winsize *winp" .Ft int diff --git a/src/lib/libutil/pidfile.3 b/src/lib/libutil/pidfile.3 index 856ea661..2ecbb6bb 100644 --- a/src/lib/libutil/pidfile.3 +++ b/src/lib/libutil/pidfile.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pidfile.3,v 1.6 2008/06/26 05:42:05 ray Exp $ +.\" $OpenBSD: pidfile.3,v 1.7 2013/06/05 03:40:26 tedu Exp $ .\" $NetBSD: pidfile.3,v 1.2 2001/04/12 22:34:31 sommerfeld Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -28,14 +28,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: June 5 2013 $ .Dt PIDFILE 3 .Os .Sh NAME .Nm pidfile .Nd write a daemon pid file .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn pidfile "const char *basename" .Sh DESCRIPTION diff --git a/src/lib/libutil/pkcs5_pbkdf2.3 b/src/lib/libutil/pkcs5_pbkdf2.3 index 803e484c..07b0887e 100644 --- a/src/lib/libutil/pkcs5_pbkdf2.3 +++ b/src/lib/libutil/pkcs5_pbkdf2.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkcs5_pbkdf2.3,v 1.4 2013/06/03 21:07:02 tedu Exp $ +.\" $OpenBSD: pkcs5_pbkdf2.3,v 1.5 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 2012 Ted Unangst .\" @@ -14,14 +14,14 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 3 2013 $ +.Dd $Mdocdate: June 5 2013 $ .Dt PKCS5_PBKDF2 3 .Os .Sh NAME .Nm pkcs5_pbkdf2 .Nd password-based key derivation function .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn pkcs5_pbkdf2 "const char *pass" "size_t pass_len" "const char *salt" \ "size_t salt_len" "u_int8_t *key" "size_t key_len" "u_int rounds" diff --git a/src/lib/libutil/pw_init.3 b/src/lib/libutil/pw_init.3 index 3d775f8f..fb079898 100644 --- a/src/lib/libutil/pw_init.3 +++ b/src/lib/libutil/pw_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pw_init.3,v 1.11 2007/11/19 22:07:37 jmc Exp $ +.\" $OpenBSD: pw_init.3,v 1.12 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 19 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt PW_INIT 3 .Os .Sh NAME @@ -45,8 +45,8 @@ .Nm pw_error .Nd utility functions for interactive passwd file updates .Sh SYNOPSIS -.Fd #include -.Fd #include +.In pwd.h +.In util.h .Ft void .Fn pw_init .Ft void diff --git a/src/lib/libutil/pw_lock.3 b/src/lib/libutil/pw_lock.3 index 430b4138..ce55d030 100644 --- a/src/lib/libutil/pw_lock.3 +++ b/src/lib/libutil/pw_lock.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pw_lock.3,v 1.15 2007/11/19 22:07:37 jmc Exp $ +.\" $OpenBSD: pw_lock.3,v 1.16 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 19 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt PW_LOCK 3 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nm pw_abort .Nd passwd file update functions .Sh SYNOPSIS -.Fd #include +.In util.h .Ft int .Fn pw_lock "int retries" .Ft int diff --git a/src/lib/libutil/readlabelfs.3 b/src/lib/libutil/readlabelfs.3 index 38406de9..8bd01698 100644 --- a/src/lib/libutil/readlabelfs.3 +++ b/src/lib/libutil/readlabelfs.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: readlabelfs.3,v 1.7 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: readlabelfs.3,v 1.8 2013/06/05 03:40:26 tedu Exp $ .\" .\" Copyright (c) 1996, Jason Downs. All rights reserved. .\" @@ -23,14 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt READLABELFS 3 .Os .Sh NAME .Nm readlabelfs .Nd read disklabel filesystem type .Sh SYNOPSIS -.Fd #include +.In util.h .Ft char * .Fn readlabelfs "char *device" "int verbose" .Sh DESCRIPTION diff --git a/src/lib/libutil/uucplock.3 b/src/lib/libutil/uucplock.3 index aff5f403..edd329f8 100644 --- a/src/lib/libutil/uucplock.3 +++ b/src/lib/libutil/uucplock.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uucplock.3,v 1.17 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: uucplock.3,v 1.18 2013/06/05 03:40:26 tedu Exp $ .\" .\" All rights reserved. .\" @@ -23,7 +23,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" " -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 5 2013 $ .Dt UUCPLOCK 3 .Os .Sh NAME @@ -33,8 +33,8 @@ .Nm uu_lock_txfr .Nd acquire and release control of a serial device .Sh SYNOPSIS -.Fd #include -.Fd #include +.In sys/types.h +.In util.h .Ft int .Fn uu_lock "const char *ttyname" .Ft int