In this auxiliary script, replace the deprecated getopt with getopts.
There is no pressing reason to do so, but let's stop perpetuating
an obsolete idiom.
ok?
Index: usr.sbin/switchd/genmap.sh
===================================================================
RCS file: /cvs/src/usr.sbin/switchd/genmap.sh,v
retrieving revision 1.6
diff -u -p -r1.6 genmap.sh
--- usr.sbin/switchd/genmap.sh 18 Nov 2016 16:49:35 -0000 1.6
+++ usr.sbin/switchd/genmap.sh 30 Apr 2021 20:56:22 -0000
@@ -21,34 +21,26 @@ INPUT=""
HEADER=""
DESCR=0
-args=`getopt di:o:h:t:m: $*`
-
-if [ $? -ne 0 ]; then
- echo "usage: $0 [-d] -i input -h header -t token [-m mapfile]"
- exit 1
-fi
-
-set -- $args
-while [ $# -ne 0 ]; do
- case "$1" in
- -d)
- DESCR=1; shift;
+while getopts di:h:t:m: name; do
+ case $name in
+ d)
+ DESCR=1
;;
- -i)
- INPUT="$2"; shift; shift;
+ i)
+ INPUT=$OPTARG
;;
- -h)
- HEADER="$2"; shift; shift;
+ h)
+ HEADER=$OPTARG
;;
- -t)
- TOKEN="$2"; shift; shift;
+ t)
+ TOKEN=$OPTARG
;;
- -m)
- MAPFILE="$2"; shift; shift;
+ m)
+ MAPFILE=$OPTARG
;;
- --)
- shift;
- break
+ ?)
+ echo "usage: $0 [-d] -i input -h header -t token [-m mapfile]"
+ exit 1
;;
esac
done
--
Christian "naddy" Weisgerber na...@mips.inka.de
