Module Name: src
Committed By: martin
Date: Fri Jan 17 12:27:07 UTC 2025
Modified Files:
src/share/man/man5 [netbsd-10]: services.5
src/usr.sbin/services_mkdb [netbsd-10]: services_mkdb.8
Log Message:
Pull up following revision(s) (requested by uwe in ticket #1040):
share/man/man5/services.5: revision 1.11
usr.sbin/services_mkdb/services_mkdb.8: revision 1.13
services(5): consistently refer to the cdb database
While here, fix a few markup nits.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.56.1 src/share/man/man5/services.5
cvs rdiff -u -r1.12 -r1.12.56.1 src/usr.sbin/services_mkdb/services_mkdb.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man5/services.5
diff -u src/share/man/man5/services.5:1.10 src/share/man/man5/services.5:1.10.56.1
--- src/share/man/man5/services.5:1.10 Wed May 13 12:58:34 2009
+++ src/share/man/man5/services.5 Fri Jan 17 12:27:06 2025
@@ -1,4 +1,4 @@
-.\" $NetBSD: services.5,v 1.10 2009/05/13 12:58:34 wiz Exp $
+.\" $NetBSD: services.5,v 1.10.56.1 2025/01/17 12:27:06 martin Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)services.5 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 19, 2007
+.Dd February 12, 2023
.Dt SERVICES 5
.Os
.Sh NAME
@@ -56,11 +56,11 @@ tab characters.
The port number and protocol name are considered a single
.Em item ;
a slash
-.Pq Dq /
-is used to separate the port and protocol (e.g.
-.Dq 512/tcp ) .
+.Pq Ql /
+is used to separate the port and protocol
+.Pq e.g. Ql 512/tcp .
A hash
-.Pq Dq \&#
+.Pq Ql #
indicates the beginning of
a comment; subsequent characters up to the end of the line are
not interpreted by the routines which search the file.
@@ -69,17 +69,16 @@ Service names may contain any printable
field delimiter, newline, or comment character.
.Pp
The database in
-.Pa /var/db/services.db
+.Pa /var/db/services.cdb
needs to be updated with
.Xr services_mkdb 8
after changes to the services file have been applied.
.Sh FILES
-.Bl -tag -width /etc/services -compact
+.Bl -tag -width Pa -compact
.It Pa /etc/services
-The
-.Nm services
-file resides in
-.Pa /etc .
+The current services file.
+.It Pa /var/db/services.cdb
+The current services database.
.El
.Sh SEE ALSO
.Xr getservent 3 ,
Index: src/usr.sbin/services_mkdb/services_mkdb.8
diff -u src/usr.sbin/services_mkdb/services_mkdb.8:1.12 src/usr.sbin/services_mkdb/services_mkdb.8:1.12.56.1
--- src/usr.sbin/services_mkdb/services_mkdb.8:1.12 Wed May 5 22:11:19 2010
+++ src/usr.sbin/services_mkdb/services_mkdb.8 Fri Jan 17 12:27:06 2025
@@ -1,4 +1,4 @@
-.\" $NetBSD: services_mkdb.8,v 1.12 2010/05/05 22:11:19 wiz Exp $
+.\" $NetBSD: services_mkdb.8,v 1.12.56.1 2025/01/17 12:27:06 martin Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 5, 2010
+.Dd February 12, 2023
.Dt SERVICES_MKDB 8
.Os
.Sh NAME
@@ -45,7 +45,7 @@
.Sh DESCRIPTION
.Nm
creates a
-.Xr db 3
+.Xr cdb 5
database for the specified file.
If no file is specified, then
.Pa /etc/services
@@ -54,13 +54,13 @@ The database is installed into
.Pa /var/db/services.cdb
for CDB format and into
.Pa /var/db/services.db
-for DB format (see
+for legacy DB format (see
.Fl V ) .
-The file must be in the correct format (see
-.Xr services 5 ) .
+The file must be in the correct format
+.Pq see Xr services 5 .
.Pp
The options are as follows:
-.Bl -tag -width indent
+.Bl -tag -width Fl
.It Fl o Ar database
Put the output databases in the named file.
.It Fl q
@@ -68,13 +68,13 @@ Don't warn about duplicate services.
This is the default behavior.
.It Fl u
Print the services file to stdout, omitting duplicate entries and comments.
-.It Fl V
+.It Fl V Ar style
Create a specific version of the database style.
.Ar style
can be
-.Li cdb
+.Cm cdb
to request the CDB format (default) or
-.Li db
+.Cm db
to request the DB format.
The DB format is useful for compatibility with old statically
linked binaries.
@@ -82,23 +82,24 @@ linked binaries.
Warn about duplicate services.
.El
.Pp
-The databases are used by the C library services routines (see
-.Xr getservent 3 ) .
+The databases are used by the C library services routines
+.Pq see Xr getservent 3 .
.Pp
.Nm
exits zero on success, non-zero on failure.
.Sh FILES
-.Bl -tag -width 24n -compact
-.It Pa /var/db/services.db
-The current services database.
-.It Pa /var/db/services.db.tmp
-A temporary file.
+.Bl -tag -width Pa -compact
.It Pa /etc/services
The current services file.
+.It Pa /var/db/services.cdb
+The current services database.
+.It Pa /var/db/services.cdb.tmp
+A temporary file.
.El
.Sh SEE ALSO
.Xr db 3 ,
.Xr getservent 3 ,
+.Xr cdb 5 ,
.Xr services 5
.Sh BUGS
Because
