Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/genassym Use shell builtin getopts instead of getopt...



details:   https://anonhg.NetBSD.org/src/rev/dbb682d9d5dd
branches:  trunk
changeset: 749396:dbb682d9d5dd
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sat Nov 28 20:30:01 2009 +0000

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

diffstat:

 usr.bin/genassym/genassym.sh |  27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diffs (47 lines):

diff -r 0c659cea9edd -r dbb682d9d5dd usr.bin/genassym/genassym.sh
--- a/usr.bin/genassym/genassym.sh      Sat Nov 28 20:09:56 2009 +0000
+++ b/usr.bin/genassym/genassym.sh      Sat Nov 28 20:30:01 2009 +0000
@@ -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..
 



Home | Main Index | Thread Index | Old Index