turn all usages into angle brackets

[evade-mail-usrlocal.git] / service

diff --git a/service b/service
index 3e1197d141b6b21dc4b768e4aaf7b05465ea3e85..2774f49073ac91c58dd3f2a921e8741554d980ab 100755 (executable)
--- a/service
+++ b/service
@@ -1,30 +1,30 @@
 #!/usr/bin/perl -w
 our $usage1 = <<'END';
-usage: ../fyvzl [OPTIONS DATABASE-FILE ACTION ARG
+usage: ../fyvzl [<options>] <database-file> <action> <arg>...
 options
-  -lLENGTH   (for create)
-  -mMAXPERUSER
-  -dDOM
-  -qQUALDOM
+  -l<minrandlength>   (for create/choose, number of letters)
+  -m<maxperuser>
+  -d<dom>
+  -q<qualdom>
   -C     (show comments in output)
   -h     (display help)
 END
 our $usage2 = <<'END';
 actions
-  create [REDIRECT] [#COMMENT]    (default for REDIRECT is your username)
-  choose [REDIRECT] [#COMMENT]    (interactively see and allocate suggestions)
-  update ADDR [REDIRECT] [#COMMENT]
-  show ADDR
+  create [<genopts>] [<redirect>] [#<comment>]  (default redirect is username)
+  choose [<genopts>] [<redirect>] [#<comment>]  (interactively allocate)
+  update <addr> [<redirect>] [#<comment>]
+  show <addr>
   list
   list-actions
-empty string for REDIRECT means reject
+empty string for redirect means reject
 END
 our $usage3 = <<'END';
 privileged actions
-  list-user USER
-  insert-exact ADDR USER REDIRECT COMMENT
-  donate ADDR USER
-  enable-user|disable-user USER
+  list-user <user>
+  insert-exact <addr> <user> <redirect> <comment>
+  donate <addr> <user>
+  enable-user|disable-user <user>
 END
 #/
 
@@ -33,7 +33,10 @@ use strict;
 use DBI;
 use POSIX;
 
-our $randlength = 6;
+our $minrandlength = 6;
+our $randlength;
+our $maxrandlength = 50;
+
 our $maxperuser = 10000;
 our $qualdom;
 our $dbh;
@@ -192,7 +195,33 @@ sub prepare_create () {
     binmode R;
 }
 
+sub genopt_alphanum {
+    local ($_) = @_;
+    if (m/^-l(\d+)$/) {
+       $randlength = $1;
+       die "length out of range $minrandlength..$maxrandlength\n"
+           unless ($minrandlength<=$randlength &&
+                   $randlength<=$maxrandlength);
+    } else {
+       die "unknown alphanumeric generation option\n";
+    }
+}
+
+sub gendefaults_alphanum {
+    $randlength ||= $minrandlength;
+}
+
+sub genopts {
+    while (@ARGV && $ARGV[0] =~ m/^-/) {
+       my $arg = shift @ARGV;
+       last if $arg =~ m/^--?$/;
+       { no strict qw(refs); &{"genopt_$genmethod"}($arg); }
+    }
+    { no strict qw(refs); &{"gendefaults_$genmethod"}(); }
+}
+
 sub action_create {
+    genopts;
     my $newrow = rhsargs({'redirect'=>$user, 'comment'=>''});
     prepare_create();
     $newrow->{'user'} = $user;
@@ -203,6 +232,7 @@ sub action_create {
 }
 
 sub action_choose {
+    genopts;
     my $template = rhsargs({'redirect'=>$user, 'comment'=>''});
     $template->{'user'} = $user;
     prepare_create();
@@ -362,7 +392,7 @@ while (@ARGV) {
     for (;;) {
        last unless m/^-./;
        if (s/^-l(\d+)$//) {
-           $randlength = $1;
+           $minrandlength = $1;
        } elsif (s/^-m(\d+)$//) {
            $maxperuser = $1;
        } elsif (s/^-d(\S+)$//) {
@@ -391,9 +421,10 @@ if (defined $ENV{'USERV_USER'}) {
 }
 
 $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"
+    ? "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;
 
 $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile","","",