--- adduser.pl	2001/01/26 12:39:34	1.1
+++ adduser.pl	2001/09/06 09:32:55	1.4
@@ -6,34 +6,41 @@
 
 my $htpasswd = shift @ARGV || ".htusers";
 
+if ($htpasswd eq "-h") {
+	print "Usage: $0 [htusers file] [login] [full name] [password] [email]\n";
+	exit;
+}
+
 my $login = shift @ARGV;
-if (! $login) {
+while (! $login) {
 	print "login: ";
 	$login=<STDIN>; chomp $login;
 }
 
 my $fullname = shift @ARGV;
-if (! $fullname) {
+while (! $fullname) {
 	print "full name: ";
 	$fullname=<STDIN>; chomp $fullname;
 }
 
-my $passswd = shift @ARGV;
-if (! $passswd) {
+my $passwd = shift @ARGV;
+if (! $passwd) {
 	print "password [auth_pop3]: ";
 	$passwd=<STDIN>; chomp $passwd;
 	if ($passwd eq "") {
 		$passwd="auth_pop3";
-	} elsif (substr($passwd,0,5) ne "auth_") {
-		$passwd=md5_hex($login.$passwd);
 	}
 }
+if (substr($passwd,0,5) ne "auth_") {
+		$passwd=md5_hex($login.$passwd);
+}
 
 my $email = shift @ARGV;
-while (! $email || $email !~ /@/) {
+while (! $email || $email !~ /\w@\w/) {
 	print "e-mail: ";
 	$email=<STDIN>; chomp $email;
-	print "e-mail address needs to have @ for auth_pop3 to work!\n" if ($email !~ /@/);
+	print "e-mail address needs to have user\@domain for auth_pop3",
+	      " to work!\n" if ($email !~ /\w@\w/);
 }
 
 if (! -e "$htpasswd") {
@@ -42,5 +49,6 @@
 } else {
 	open(HTPASSWD,">> $htpasswd") || die "append $htpasswd: $!";
 }
+
 print HTPASSWD "$login:$fullname:$passwd:$email\n";
 close(HTPASSWD);