Module Name:    src
Committed By:   dsl
Date:           Sat Nov 28 20:30:02 UTC 2009

Modified Files:
        src/usr.bin/genassym: genassym.sh

Log Message:
Use shell builtin getopts instead of getopt(1).
Fixes PR/30425


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/genassym/genassym.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/genassym/genassym.sh
diff -u src/usr.bin/genassym/genassym.sh:1.5 src/usr.bin/genassym/genassym.sh:1.6
--- src/usr.bin/genassym/genassym.sh:1.5	Sun Oct 18 18:14:00 2009
+++ src/usr.bin/genassym/genassym.sh	Sat Nov 28 20:30:01 2009
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: genassym.sh,v 1.5 2009/10/18 18:14:00 snj Exp $
+#	$NetBSD: genassym.sh,v 1.6 2009/11/28 20:30:01 dsl Exp $
 #
 # Copyright (c) 1997 Matthias Pfaller.
 # All rights reserved.
@@ -37,25 +37,22 @@
 	echo "usage: ${progname} [-c | -f] -- compiler command" >&2
 }
 
-args=`getopt cf $*`
-if [ $? != 0 ]; then
-	usage;
-	exit 1;
-fi
-set -- $args
-
-for i; do
+while getopts cf i
+do
 	case "$i" in
-	-c)
+	c)
 		ccode=1
-		shift;;
-	-f)
+		;;
+	f)
 		fcode=1
-		shift;;
-	--)
-		shift; break;;
+		;;
 	esac
 done
+shift $(($OPTIND - 1))
+if [ $# -eq 0 ]; then
+	usage
+	exit 1
+fi
 
 # Deal with any leading environment settings..
 

Reply via email to