[pkgsrc/trunk]: pkgsrc/mk/install Fix {group,user}_exists functions when the ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f08b45776596
branches:  trunk
changeset: 511860:f08b45776596
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Apr 24 15:44:32 2006 +0000

description:
Fix {group,user}_exists functions when the numeric ID is not set.  Fix
provided in PR pkg/33346 by Yoshito Komatsu.

diffstat:

 mk/install/usergroupfuncs           |  12 +++++++++---
 mk/install/usergroupfuncs.DragonFly |  12 +++++++++---
 mk/install/usergroupfuncs.FreeBSD   |  12 +++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diffs (135 lines):

diff -r d3bab9867acd -r f08b45776596 mk/install/usergroupfuncs
--- a/mk/install/usergroupfuncs Mon Apr 24 13:52:04 2006 +0000
+++ b/mk/install/usergroupfuncs Mon Apr 24 15:44:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs,v 1.4 2006/04/23 00:00:44 jlam Exp $
+# $NetBSD: usergroupfuncs,v 1.5 2006/04/24 15:44:32 jlam Exp $
 #
 # Default implementations of user_exists() and group_exists() shell
 # functions for checking the existence of users and groups, and of
@@ -11,7 +11,7 @@
 #      pkgsrc/mk/install/usergroupfuncs.${OPSYS}
 #
 
-# group_exists group groupid
+# group_exists group [groupid]
 #      Returns 0 if $group exists and has gid $groupid
 #      Returns 1 if neither $group nor $groupid exist
 #      Returns 2 if $group or $groupid exist but don't match
@@ -33,6 +33,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_groupid"; then
+               # $_group doesn't exist and $_group is not set
+               return 1
        elif ${CHGRP} $_groupid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $4 }'`
                if ${TEST} "$_name" != "$_groupid"; then
@@ -45,7 +48,7 @@
        ${RM} -f $_testfile; return 3
 }
 
-# user_exists user userid
+# user_exists user [userid]
 #      Returns 0 if $user exists and has uid $userid
 #      Returns 1 if neither $user nor $userid exist
 #      Returns 2 if $user or $userid exist but don't match
@@ -67,6 +70,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_userid"; then
+               # $_user doesn't exist and $_userid is not set
+               return 1
        elif ${CHOWN} $_userid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $3 }'`
                if ${TEST} "$_name" != "$_userid"; then
diff -r d3bab9867acd -r f08b45776596 mk/install/usergroupfuncs.DragonFly
--- a/mk/install/usergroupfuncs.DragonFly       Mon Apr 24 13:52:04 2006 +0000
+++ b/mk/install/usergroupfuncs.DragonFly       Mon Apr 24 15:44:32 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: usergroupfuncs.DragonFly,v 1.2 2006/04/23 00:00:44 jlam Exp $
+# $NetBSD: usergroupfuncs.DragonFly,v 1.3 2006/04/24 15:44:32 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
 
-# group_exists group groupid
+# group_exists group [groupid]
 #      Returns 0 if $group exists and has gid $groupid
 #      Returns 1 if neither $group nor $groupid exist
 #      Returns 2 if $group or $groupid exist but don't match
@@ -25,6 +25,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_groupid"; then
+               # $_group doesn't exist and $_group is not set
+               return 1
        elif ${CHGRP} $_groupid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $4 }'`
                if ${TEST} "$_name" != "$_groupid"; then
@@ -37,7 +40,7 @@
        ${RM} -f $_testfile; return 3
 }
 
-# user_exists user userid
+# user_exists user [userid]
 #      Returns 0 if $user exists and has uid $userid
 #      Returns 1 if neither $user nor $userid exist
 #      Returns 2 if $user or $userid exist but don't match
@@ -59,6 +62,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_userid"; then
+               # $_user doesn't exist and $_user is not set
+               return 1
        elif ${CHOWN} $_userid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $3 }'`
                if ${TEST} "$_name" != "$_userid"; then
diff -r d3bab9867acd -r f08b45776596 mk/install/usergroupfuncs.FreeBSD
--- a/mk/install/usergroupfuncs.FreeBSD Mon Apr 24 13:52:04 2006 +0000
+++ b/mk/install/usergroupfuncs.FreeBSD Mon Apr 24 15:44:32 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: usergroupfuncs.FreeBSD,v 1.2 2006/04/23 00:00:44 jlam Exp $
+# $NetBSD: usergroupfuncs.FreeBSD,v 1.3 2006/04/24 15:44:32 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
 
-# group_exists group groupid
+# group_exists group [groupid]
 #      Returns 0 if $group exists and has gid $groupid
 #      Returns 1 if neither $group nor $groupid exist
 #      Returns 2 if $group or $groupid exist but don't match
@@ -25,6 +25,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_groupid"; then
+               # $_group doesn't exist and $_group is not set
+               return 1
        elif ${CHGRP} $_groupid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $4 }'`
                if ${TEST} "$_name" != "$_groupid"; then
@@ -37,7 +40,7 @@
        ${RM} -f $_testfile; return 3
 }
 
-# user_exists user userid
+# user_exists user [userid]
 #      Returns 0 if $user exists and has uid $userid
 #      Returns 1 if neither $user nor $userid exist
 #      Returns 2 if $user or $userid exist but don't match
@@ -59,6 +62,9 @@
                        ${RM} -f $_testfile; return 0
                fi
                ${RM} -f $_testfile; return 2
+       elif ${TEST} -z "$_userid"; then
+               # $_user doesn't exist and $_user is not set
+               return 1
        elif ${CHOWN} $_userid $_testfile >/dev/null 2>&1; then
                _name=`${LS} -l $_testfile 2>/dev/null | ${AWK} '{ print $3 }'`
                if ${TEST} "$_name" != "$_userid"; then