Module Name: src
Committed By: christos
Date: Tue Apr 21 22:49:46 UTC 2015
Modified Files:
src/games/wtf: wtf wtf.6
Log Message:
Add -o flag.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/games/wtf/wtf
cvs rdiff -u -r1.16 -r1.17 src/games/wtf/wtf.6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/wtf/wtf
diff -u src/games/wtf/wtf:1.19 src/games/wtf/wtf:1.20
--- src/games/wtf/wtf:1.19 Tue Nov 20 07:40:54 2012
+++ src/games/wtf/wtf Tue Apr 21 18:49:46 2015
@@ -1,20 +1,23 @@
#!/bin/sh
#
-# $NetBSD: wtf,v 1.19 2012/11/20 12:40:54 abs Exp $
+# $NetBSD: wtf,v 1.20 2015/04/21 22:49:46 christos Exp $
#
# Public domain
#
PROGNAME="$(basename "$0")"
+offensive=false
usage() {
- echo "usage: $PROGNAME [-f dbfile] [is] term ..."
+ echo "usage: $PROGNAME [-o] [-f dbfile] [is] term ..."
exit 1
}
-while getopts f: f
+while getopts f:o f
do
case "$f" in
+ o) offensive=true
+ ;;
f)
acronyms="$OPTARG $acronyms"
;;
@@ -35,7 +38,20 @@ if [ -z "$1" ]; then
fi
if [ -z "$acronyms" ]; then
- acronyms=${ACRONYMDB:-$(ls /usr/share/misc/acronyms* 2>/dev/null)}
+ if [ -z "$ACRONYMDB" ]; then
+ for f in /usr/share/misc/acronyms*; do
+ case $f in
+ *-o)
+ if $offensive; then
+ acronyms="$acronyms $f"
+ fi
+ ;;
+ *)
+ acronyms="$acronyms $f"
+ ;;
+ esac
+ done
+ fi
fi
if [ -z "$acronyms" ]; then
Index: src/games/wtf/wtf.6
diff -u src/games/wtf/wtf.6:1.16 src/games/wtf/wtf.6:1.17
--- src/games/wtf/wtf.6:1.16 Tue Nov 20 07:40:54 2012
+++ src/games/wtf/wtf.6 Tue Apr 21 18:49:46 2015
@@ -1,8 +1,8 @@
-.\" $NetBSD: wtf.6,v 1.16 2012/11/20 12:40:54 abs Exp $
+.\" $NetBSD: wtf.6,v 1.17 2015/04/21 22:49:46 christos Exp $
.\"
.\" Public Domain
.\"
-.Dd November 20, 2012
+.Dd April 21, 2015
.Dt WTF 6
.Os
.Sh NAME
@@ -11,6 +11,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl f Ar dbfile
+.Op Fl o
.Op Ar is
.Ar term ...
.Sh DESCRIPTION
@@ -50,6 +51,13 @@ Unlike this variable the
.Fl f
option only accepts one file name as an argument,
but it may be given multiple times to specify more than one file to use.
+.It Fl o
+Include acronyms that could be considered offensive to some.
+Please consult
+.Xr forture 6
+for more information about the
+.Fl o
+flag.
.El
.Sh ENVIRONMENT
.Bl -tag -width ACRONYMDB
@@ -70,7 +78,8 @@ default computer-related acronym databas
.Sh SEE ALSO
.Xr make 1 ,
.Xr pkg_info 1 ,
-.Xr whatis 1
+.Xr whatis 1 ,
+.Xr fortune 6
.Sh HISTORY
.Nm
first appeared in
