From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Oct 2013 20:22:27 +0000 (+0000)
Subject: pregen: wip
X-Git-Tag: test~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?p=d.git;a=commitdiff_plain;h=d25c77ad53fbfd696887ef4380bf53a9db843f05

pregen: wip
---

diff --git a/evade-mail-pregen b/evade-mail-pregen
index 9fcafc6..e15ae83 100755
--- a/evade-mail-pregen
+++ b/evade-mail-pregen
@@ -81,9 +81,9 @@ sub fetch_list () {
 
 sub perhaps_generate ($) {
     my ($num) = @_;
-    return undef if $no_generate;
     my $alias = $by_number[$num];
     return $alias if $alias;
+    return undef if $no_generate;
     return undef unless $num > $#by_number;
     run_generator qw(create), (comment_make $num);
     $alias = $by_number[$num];
@@ -142,6 +142,7 @@ sub action_list {
     @ARGV==0 or
 	badusage "invalid arguments to list";
     my $num = $min_number;
+    $num ||= 0;
     while ($num <= $#by_number) {
 	my $alias = $by_number[$num];
 	report $alias if $alias;
@@ -154,13 +155,19 @@ sub action_some {
      badusage "invalid arguments to some";
     my ($count) = $1;
     my $num = $min_number;
+    $num ||= 0;
     while ($count > 0) {
-	my $alias = generate $num;
+	my $alias = perhaps_generate $num;
 	if ($alias) {
 	    report $alias;
 	    $count--;
 	} else {
-	    last if $num > $#by_number; # -N
+	    if ($num > $#by_number) {
+		print STDERR <<END or fail "stderr: $!";
+$us: fewer than requested aliases printed, due to -N
+END
+		last;
+	    }
 	    $num++;
 	}
     }
@@ -176,7 +183,7 @@ sub action_range {
 	$op eq '-' ? $rarg :
 	confess "$op ??";
     for (; $num<=$limit; $num++) {
-	my $alias = generate $num;
+	my $alias = perhaps_generate $num;
 	report $alias if $alias;
     }
 }