chiark
/
gitweb
/
~ijackson
/
d.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d25c77a
)
pregen: wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 Oct 2013 20:30:34 +0000
(20:30 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Nov 2013 15:26:33 +0000
(15:26 +0000)
evade-mail-pregen
patch
|
blob
|
history
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
($alias,$comment) = ($1,$2);
} elsif (m/^\#/) {
next; # future extension
- } elsif (m/^([^#: ])\: [^#]* (\#.*)$/) {
+ } elsif (m/^([^#: ]
+
)\: [^#]* (\#.*)$/) {
($alias,$comment) = ($1,$2);
} else {
die "generator output $_ ?";
($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;
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;
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;
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";
or badusage "comment pattern (\`$comment_pattern')".
" must contain \`<number>' exactly once";