[pkgsrc/trunk]: pkgsrc/mk/install Fix user_exists and group_exists to actuall...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d0889e8ffbb
branches:  trunk
changeset: 491716:2d0889e8ffbb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 28 19:26:11 2005 +0000

description:
Fix user_exists and group_exists to actually use their arguments
instead of using the values stored in global variables.  Also,
consistently prepend variables that should be local to functions with
an underscore.

diffstat:

 mk/install/usergroup |  38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diffs (81 lines):

diff -r 735b6786cf3d -r 2d0889e8ffbb mk/install/usergroup
--- a/mk/install/usergroup      Mon Mar 28 18:50:02 2005 +0000
+++ b/mk/install/usergroup      Mon Mar 28 19:26:11 2005 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: usergroup,v 1.7 2005/01/31 21:41:06 jlam Exp $
+# $NetBSD: usergroup,v 1.8 2005/03/28 19:26:11 jlam Exp $
 #
 # +USERGROUP - users and groups management script
 #
@@ -68,13 +68,14 @@
 
 group_exists()
 {
-       case $group in
+       _group="$1"
+       case $_group in
        "")     return 2 ;;
        esac
        # Check using chgrp to work properly in an NIS environment.
        testfile="./grouptest.tmp.$$"
        ${ECHO} > $testfile
-       if ${CHGRP} $group $testfile >/dev/null 2>&1; then
+       if ${CHGRP} $_group $testfile >/dev/null 2>&1; then
                ${RM} -f $testfile
                return 0
        fi
@@ -84,11 +85,12 @@
 
 user_exists()
 {
-       case $user in
+       _user="$1"
+       case $_user in
        "")     return 2 ;;
        esac
        # Check using id to work properly in an NIS environment.
-       if ${ID} $user >/dev/null 2>&1; then
+       if ${ID} $_user >/dev/null 2>&1; then
                return 0
        fi
        return 1
@@ -96,24 +98,24 @@
 
 listwrap()
 {
-       length=$1
-       buffer=
-       while read line; do
-               set -- $line
-               for word; do
-                       case $buffer in
-                       "")     buffer="$word" ;;
-                       *)      buffer="$buffer  $word" ;;
+       _length=$1
+       _buffer=
+       while read _line; do
+               set -- $_line
+               for _word; do
+                       case $_buffer in
+                       "")     _buffer="$_word" ;;
+                       *)      _buffer="$_buffer  $_word" ;;
                        esac
-                       if ${TEST} ${#buffer} -gt $length; then
-                               ${ECHO} "       $buffer"
-                               buffer=
+                       if ${TEST} ${#_buffer} -gt $_length; then
+                               ${ECHO} "       $_buffer"
+                               _buffer=
                        fi
                done
        done
-       case $buffer in
+       case $_buffer in
        "")     ;;
-       *)      ${ECHO} "       $buffer" ;;
+       *)      ${ECHO} "       $_buffer" ;;
        esac
 }