[src/trunk]: src/usr.sbin/services_mkdb Add verbose flag -v and make -q the d...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e260b948af3
branches:  trunk
changeset: 754596:1e260b948af3
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed May 05 13:19:51 2010 +0000

description:
Add verbose flag -v and make -q the default behavior.

diffstat:

 usr.sbin/services_mkdb/services_mkdb.8 |   9 ++++++---
 usr.sbin/services_mkdb/services_mkdb.c |  10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (77 lines):

diff -r 53ff3f977194 -r 1e260b948af3 usr.sbin/services_mkdb/services_mkdb.8
--- a/usr.sbin/services_mkdb/services_mkdb.8    Wed May 05 07:05:33 2010 +0000
+++ b/usr.sbin/services_mkdb/services_mkdb.8    Wed May 05 13:19:51 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: services_mkdb.8,v 1.10 2010/04/25 00:54:46 joerg Exp $
+.\"    $NetBSD: services_mkdb.8,v 1.11 2010/05/05 13:19:51 joerg 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 March 19, 2010
+.Dd May 5, 2010
 .Dt SERVICES_MKDB 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd generate the services databases
 .Sh SYNOPSIS
 .Nm
-.Op Fl q
+.Op Fl qv
 .Op Fl o Ar database
 .Op Fl V Ar style
 .Op Ar file
@@ -65,8 +65,11 @@
 Put the output databases in the named file.
 .It Fl q
 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
+Warn about duplicate services.
 .It Fl V
 Create a specific version of the database style.
 .Ar style
diff -r 53ff3f977194 -r 1e260b948af3 usr.sbin/services_mkdb/services_mkdb.c
--- a/usr.sbin/services_mkdb/services_mkdb.c    Wed May 05 07:05:33 2010 +0000
+++ b/usr.sbin/services_mkdb/services_mkdb.c    Wed May 05 13:19:51 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: services_mkdb.c,v 1.15 2010/04/25 00:54:46 joerg Exp $ */
+/*     $NetBSD: services_mkdb.c,v 1.16 2010/05/05 13:19:51 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: services_mkdb.c,v 1.15 2010/04/25 00:54:46 joerg Exp $");
+__RCSID("$NetBSD: services_mkdb.c,v 1.16 2010/05/05 13:19:51 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@
        const char *fname = _PATH_SERVICES;
        const char *dbname = NULL;
        int      use_db = 0;
-       int      warndup = 1;
+       int      warndup = 0;
        int      unique = 0;
        int      otherflag = 0;
        size_t   cnt = 0;
@@ -94,6 +94,10 @@
                case 'u':
                        unique++;
                        break;
+               case 'v':
+                       otherflag = 1;
+                       warndup = 1;
+                       break;
                case 'V':
                        if (strcmp(optarg, "db") == 0)
                                use_db = 1;