break out addr2localpart

[d.git] / service

diff --git a/service b/service
index f160aaca213322281950353128a1e54613f9728e..741206c8c318c691adb906e2130c876a3124fb1b 100755 (executable)
--- a/service
+++ b/service
@@ -48,13 +48,17 @@ sub nextarg () {
     return $v;
 }
 
-sub nextarg_addr () {
-    my $addr = nextarg;
+sub addr2localpart ($) {
+    my ($addr) = @_;
     return $addr if $addr !~ m/\@/;
     die "address not in correct domain (\@$dom)\n" unless $' eq $dom; #';
     return $`; #`;
 }
 
+sub nextarg_addr () {
+    return addr2localpart nextarg;
+}
+
 sub nomoreargs () {
     die "too many arguments\n" if @ARGV;
 }
@@ -141,16 +145,9 @@ sub rhsargs ($) {
     return $row;
 }
 
-sub action_create {
-    my $newrow = rhsargs({'redirect'=>$user, 'comment'=>''});
-    open R, "/dev/urandom" or die $!;
-    binmode R;
-    my $countq = $dbh->prepare("SELECT count(*) FROM addrs WHERE user=?");
-    $countq->execute($user);
-    my ($count) = $countq->fetchrow_array();
-    die unless defined $count;
-    die "too many aliases for this user\n" if $count >= $maxperuser;
-    my $q = $dbh->prepare("SELECT localpart FROM addrs WHERE localpart=?");
+sub generate_local_part () {
+    our $checkexist_q ||=
+       $dbh->prepare("SELECT localpart FROM addrs WHERE localpart=?");
     my $s;
     for (;;) {
        $s = chr(ord('a')+goodrand(26));
@@ -161,13 +158,28 @@ sub action_create {
                      : ord('0')+($v-26));
        }
 #      print STDERR "$s\n";
-       $q->execute($s);
-       my $row = $q->fetchrow_arrayref();
+       $checkexist_q->execute($s);
+       my $row = $checkexist_q->fetchrow_arrayref();
        last if !$row;
-       $dbh->abort();
     }
+    return $s;
+}
+
+sub prepare_create () {
+    my $countq = $dbh->prepare("SELECT count(*) FROM addrs WHERE user=?");
+    $countq->execute($user);
+    my ($count) = $countq->fetchrow_array();
+    die unless defined $count;
+    die "too many aliases for this user\n" if $count >= $maxperuser;
+    open R, "/dev/urandom" or die $!;
+    binmode R;
+}
+
+sub action_create {
+    my $newrow = rhsargs({'redirect'=>$user, 'comment'=>''});
+    prepare_create();
     $newrow->{'user'} = $user;
-    $newrow->{'localpart'} = $s;
+    $newrow->{'localpart'} = generate_local_part();
     insertrow($newrow);
     $dbh->commit();
     prow($newrow);
@@ -321,8 +333,9 @@ if (defined $ENV{'USERV_USER'}) {
     $user = ((getpwuid $<)[0]) or die;
 }
 
-$usage2 .= "ADDR may be a local part, implicitly qualified with \@$dom\n"
-    if defined $qualdom;
+$usage2 .= defined $dom
+    ? "ADDR may be a local part, implicitly qualified with \@$dom\n"
+    : "ADDR must be a local part (only)\n";
 $usage2 .= "REDIRECT is implicitly qualified with \@$qualdom if it has no \@\n"
     if defined $qualdom;