Module Name: src
Committed By: jschauma
Date: Thu Apr 26 01:55:14 UTC 2012
Modified Files:
src/games/wtf: wtf
Log Message:
allow multiple '-f acronyms' arguments to be given, which makes this behave
more consistently with ACRONYMSDB, which may also point to multiple files
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/wtf/wtf
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.15 src/games/wtf/wtf:1.16
--- src/games/wtf/wtf:1.15 Mon Aug 6 21:14:36 2007
+++ src/games/wtf/wtf Thu Apr 26 01:55:14 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: wtf,v 1.15 2007/08/06 21:14:36 hubertf Exp $
+# $NetBSD: wtf,v 1.16 2012/04/26 01:55:14 jschauma Exp $
#
# Public domain
#
@@ -12,13 +12,6 @@ usage() {
exit 1
}
-acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`}
-
-if [ "$acronyms" = "" ]; then
- echo "$PROGNAME: acronyms database not found!" >&2
- exit 1
-fi
-
args=`getopt f: $*`
if [ $? -ne 0 ]; then
usage
@@ -27,7 +20,7 @@ set -- $args
while [ $# -gt 0 ]; do
case "$1" in
-f)
- acronyms=$2; shift
+ acronyms="$2 $acronyms"; shift
;;
--)
shift; break
@@ -44,8 +37,17 @@ if [ $# -lt 1 ] ; then
usage
fi
-for f in $acronyms
-do
+if [ "$acronyms" = "" ]; then
+ acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`}
+fi
+
+if [ "$acronyms" = "" ]; then
+ echo "$PROGNAME: acronyms database not found!" >&2
+ exit 1
+fi
+
+
+for f in $acronyms ; do
if [ ! -f $f ]; then
echo "$PROGNAME: cannot open acronyms database file \`$f'" >&2
exit 1
