pregen: wip

diff --git a/evade-mail-pregen b/evade-mail-pregen
index e15ae83d8edcf7b3e777d8ac9776f7b245c79b84..91466a1cc6271c2013d6816bceec8b7084c2d521 100755 (executable)
--- a/evade-mail-pregen
+++ b/evade-mail-pregen
@@ -54,7 +54,7 @@ sub run_generator {
            ($alias,$comment) = ($1,$2);
        } elsif (m/^\#/) {
            next; # future extension
-       } elsif (m/^([^#: ])\: [^#]* (\#.*)$/) {
+       } elsif (m/^([^#: ]+)\: [^#]* (\#.*)$/) {
            ($alias,$comment) = ($1,$2);
        } else {
            die "generator output $_ ?";
@@ -143,9 +143,10 @@ sub action_list {
        badusage "invalid arguments to list";
     my $num = $min_number;
     $num ||= 0;
-    while ($num <= $#by_number) {
+    for (; $num <= $#by_number; $num++) {
        my $alias = $by_number[$num];
        report $alias if $alias;
+       $num++;
     }
 }
 
@@ -217,7 +218,7 @@ $comment_pattern =~ m/^#/s
     or badusage "comment pattern must start with \`#'";
 $comment_re = $comment_pattern;
 $comment_re =~ s/\W/\\$&/g;
-($comment_re =~ s'\\<number\\>'([1-9]\d{0,8})'g) == 1 #'
+($comment_re =~ s'\\<number\\>'(0|[1-9]\d{0,8})'g) == 1 #'
     or badusage "comment pattern (\`$comment_pattern')".
          " must contain \`<number>' exactly once";