From 74d319eec907585c42c648e88cc31481d01d0ffc Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Mon, 20 Aug 2001 11:01:25 +0000 Subject: [PATCH] code cleaning --- script/has_usrgrp.pl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/script/has_usrgrp.pl b/script/has_usrgrp.pl index 63d73de..c0dfb31 100755 --- a/script/has_usrgrp.pl +++ b/script/has_usrgrp.pl @@ -4,25 +4,26 @@ # on the system (getpwnam() and getgrnam() use nsswitch.conf, so it works # even if NYS (or similar) is used) -if ( $#ARGV < 1 || $#ARGV > 2) { - print "usage:\n has_usrgrp.pl [-user user|-group group] [-printgid]\n"; - exit 1; +sub usage { + return "usage:\n has_usrgrp.pl [-user user|-group group] [-printgid]\n"; +} + +if ( @ARGV < 2 || @ARGV > 3) { + die usage(); } if ( $ARGV[0] eq "-user" ) { - ($name, $passwd, $uid, $gid, $quota, $comment, - $gcos, $dir, $shell, $expire) = getpwnam($ARGV[1]); + ($name, $passwd, $uid, $gid) = getpwnam($ARGV[1]); } elsif ( $ARGV[0] eq "-group" ) { - ($name, $passwd, $gid, $members) = getgrnam($ARGV[1]); + ($name, $passwd, $gid) = getgrnam($ARGV[1]); } else { - print "usage:\n has_usrgrp.pl [-user user|-group group] [-printgid]\n"; - exit 1; + die usage(); } if ($name) { - if ( $#ARGV == 2 && $ARGV[2] eq "-printgid" ) { + if ( @ARGV == 3 && $ARGV[2] eq "-printgid" ) { print $gid, "\n"; } exit 0; -- 2.47.3