Module Name: src
Committed By: wiz
Date: Wed May 5 22:10:50 UTC 2010
Modified Files:
src/usr.sbin/services_mkdb: services_mkdb.c
Log Message:
Accept -v in getopt(); sort flag cases.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/services_mkdb/services_mkdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/services_mkdb/services_mkdb.c
diff -u src/usr.sbin/services_mkdb/services_mkdb.c:1.16 src/usr.sbin/services_mkdb/services_mkdb.c:1.17
--- src/usr.sbin/services_mkdb/services_mkdb.c:1.16 Wed May 5 13:19:51 2010
+++ src/usr.sbin/services_mkdb/services_mkdb.c Wed May 5 22:10:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: services_mkdb.c,v 1.16 2010/05/05 13:19:51 joerg Exp $ */
+/* $NetBSD: services_mkdb.c,v 1.17 2010/05/05 22:10:50 wiz 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.16 2010/05/05 13:19:51 joerg Exp $");
+__RCSID("$NetBSD: services_mkdb.c,v 1.17 2010/05/05 22:10:50 wiz Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -81,23 +81,19 @@
setprogname(argv[0]);
- while ((ch = getopt(argc, argv, "qo:uV:")) != -1)
+ while ((ch = getopt(argc, argv, "o:quV:v")) != -1)
switch (ch) {
- case 'q':
- otherflag = 1;
- warndup = 0;
- break;
case 'o':
otherflag = 1;
dbname = optarg;
break;
+ case 'q':
+ otherflag = 1;
+ warndup = 0;
+ break;
case 'u':
unique++;
break;
- case 'v':
- otherflag = 1;
- warndup = 1;
- break;
case 'V':
if (strcmp(optarg, "db") == 0)
use_db = 1;
@@ -106,6 +102,10 @@
else
usage();
break;
+ case 'v':
+ otherflag = 1;
+ warndup = 1;
+ break;
default:
usage();
}
