Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add quiet mode.

Browse Source
This commit is contained in:
christos 2007-05-08 20:14:59 +00:00
parent f56bfb975c
commit deb490e687
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/services_mkdb/services_mkdb.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: services_mkdb.8,v 1.4 2006/07/30 00:24:40 wiz Exp $
.\" $NetBSD: services_mkdb.8,v 1.5 2007/05/08 20:14:59 christos Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd February 8, 1999
.Dd May 8, 2007
.Dt SERVICES_MKDB 8
.Os
.Sh NAME
@ -42,6 +42,7 @@
.Nd generate the services databases
.Sh SYNOPSIS
.Nm
.Op Fl q
.Op Fl o Ar database
.Op file
.Sh DESCRIPTION
@ -61,6 +62,8 @@ The options are as follows:
.Bl -tag -width indent
.It Fl o Ar database
Put the output databases in the named file.
.It Fl q
Don't warn about duplicate services.
.El
.Pp
The databases are used by the C library services routines (see

16
usr.sbin/services_mkdb/services_mkdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: services_mkdb.c,v 1.5 2006/07/28 16:34:28 christos Exp $ */
/* $NetBSD: services_mkdb.c,v 1.6 2007/05/08 20:14:59 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: services_mkdb.c,v 1.5 2006/07/28 16:34:28 christos Exp $");
__RCSID("$NetBSD: services_mkdb.c,v 1.6 2007/05/08 20:14:59 christos Exp $");
#endif /* not lint */
@ -75,11 +75,15 @@ main(int argc, char *argv[])
DBT data, key;
const char *fname = _PATH_SERVICES;
const char *dbname = _PATH_SERVICES_DB;
int warndup = 1;
setprogname(argv[0]);
while ((ch = getopt(argc, argv, "o:")) != -1)
while ((ch = getopt(argc, argv, "qo:")) != -1)
switch (ch) {
case 'q':
warndup = 0;
break;
case 'o':
dbname = optarg;
break;
@ -143,12 +147,12 @@ main(int argc, char *argv[])
data.size = snprintf(datab, sizeof(datab), "%zu", cnt++) + 1;
key.size = snprintf(keyb, sizeof(keyb), "%s %s/%s %s",
name, port, proto, aliases ? aliases : "") + 1;
store(fname, line, db, &data, &key, 1);
store(fname, line, db, &data, &key, warndup);
/* key `\377port/proto', data = `indirect key' */
key.size = snprintf(keyb, sizeof(keyb), "\377%s/%s",
port, proto) + 1;
store(fname, line, db, &key, &data, 1);
store(fname, line, db, &key, &data, warndup);
/* key `\377port', data = `indirect key' */
killproto(&key);
@ -244,7 +248,7 @@ store(const char *fname, size_t line, DB *db, DBT *key, DBT *data, int warndup)
static void
usage(void)
{
(void)fprintf(stderr, "Usage: %s [-o <db>] [<servicefile>]\n",
(void)fprintf(stderr, "Usage: %s [-q] [-o <db>] [<servicefile>]\n",
getprogname());
exit(1);
}