Module Name: src
Committed By: kre
Date: Fri Feb 7 01:35:38 UTC 2025
Modified Files:
src/external/bsd/blocklist/bin: blocklistctl.8 blocklistctl.c
Log Message:
Document the -D option.
Add -D to the usage, and manual page.
While here, cease referring to the non-existent -h option.
(It is -n.)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/bin/blocklistctl.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/blocklistctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/bin/blocklistctl.8
diff -u src/external/bsd/blocklist/bin/blocklistctl.8:1.3 src/external/bsd/blocklist/bin/blocklistctl.8:1.4
--- src/external/bsd/blocklist/bin/blocklistctl.8:1.3 Mon Jan 27 17:23:25 2025
+++ src/external/bsd/blocklist/bin/blocklistctl.8 Fri Feb 7 01:35:38 2025
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistctl.8,v 1.3 2025/01/27 17:23:25 christos Exp $
+.\" $NetBSD: blocklistctl.8,v 1.4 2025/02/07 01:35:38 kre Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -37,6 +37,7 @@
.Nm
.Cm dump
.Op Fl abdnrw
+.Op Fl D Ar dbname
.Sh DESCRIPTION
.Nm
is a program used to display and change the state of the
@@ -57,6 +58,12 @@ the remaining) time of
.Ql never .
.It Fl b
Show only the blocked entries.
+.It Fl D Ar dbname
+Specify the location of the
+.Ic blocklistd
+database file to use.
+The default is
+.Pa /var/db/blocklistd.db .
.It Fl d
Increase debugging level.
.It Fl n
@@ -72,7 +79,7 @@ flag, makes the display wide enough for
The output of the
.Cm dump
sub-command consists of a header (unless
-.Fl h
+.Fl n
was given) and one line for each record in the database, where each line
has the following columns:
.Bl -tag -width indent
Index: src/external/bsd/blocklist/bin/blocklistctl.c
diff -u src/external/bsd/blocklist/bin/blocklistctl.c:1.2 src/external/bsd/blocklist/bin/blocklistctl.c:1.3
--- src/external/bsd/blocklist/bin/blocklistctl.c:1.2 Sat Jun 11 19:23:26 2022
+++ src/external/bsd/blocklist/bin/blocklistctl.c Fri Feb 7 01:35:38 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklistctl.c,v 1.2 2022/06/11 19:23:26 christos Exp $ */
+/* $NetBSD: blocklistctl.c,v 1.3 2025/02/07 01:35:38 kre Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklistctl.c,v 1.2 2022/06/11 19:23:26 christos Exp $");
+__RCSID("$NetBSD: blocklistctl.c,v 1.3 2025/02/07 01:35:38 kre Exp $");
#include <stdio.h>
#include <time.h>
@@ -63,7 +63,8 @@ usage(int c)
warnx("Missing/unknown command");
else if (c != '?')
warnx("Unknown option `%c'", (char)c);
- fprintf(stderr, "Usage: %s dump [-abdnrw]\n", getprogname());
+ fprintf(stderr,
+ "Usage: %s dump [-abdnrw] [-D dbname]\n", getprogname());
exit(EXIT_FAILURE);
}
