jetmore 2006/02/16 17:03:17 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exipick.src
Log:
exipick version 20060216.1
Revision Changes Path
1.307 +10 -0 exim/exim-doc/doc-txt/ChangeLog
1.9 +16 -11 exim/exim-src/src/exipick.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- ChangeLog 16 Feb 2006 16:37:57 -0000 1.306
+++ ChangeLog 16 Feb 2006 17:03:16 -0000 1.307
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.306 2006/02/16 16:37:57 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.307 2006/02/16 17:03:16 jetmore Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -194,6 +194,16 @@
PH/38 Panic-die if .include specifies a non-absolute path.
PH/39 A tweak to the "H" retry rule from its user.
+
+JJ/03 exipick: Removed parentheses from 'next' and 'last' calls that specified
+ a label. They prevented compilation on older perls.
+
+JJ/04 exipick: Refactored code to prevent implicit split to @_ which caused
+ a warning to be raised on newish perls.
+
+JJ/05 exipick: Fixed bug where -bpc always showed a count of all messages
+ on queue. Changes to match documented behaviour of showing count of
+ messages matching specified criteria.
Exim version 4.60
Index: exipick.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exipick.src,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- exipick.src 15 Dec 2005 17:58:23 -0000 1.8
+++ exipick.src 16 Feb 2006 17:03:16 -0000 1.9
@@ -1,5 +1,5 @@
#!PERL_COMMAND
-# $Cambridge: exim/exim-src/src/exipick.src,v 1.8 2005/12/15 17:58:23 jetmore Exp $
+# $Cambridge: exim/exim-src/src/exipick.src,v 1.9 2006/02/16 17:03:16 jetmore Exp $
# This variable should be set by the building process to Exim's spool directory.
my $spool = 'SPOOL_DIRECTORY';
@@ -8,10 +8,10 @@
use Getopt::Long;
my($p_name) = $0 =~ m|/?([^/]+)$|;
-my $p_version = "20051215.3";
+my $p_version = "20060216.1";
my $p_usage = "Usage: $p_name [--help|--version] (see --help for details)";
my $p_cp = <<EOM;
- Copyright (c) 2003-2005 John Jetmore <jj33\@pobox.com>
+ Copyright (c) 2003-2006 John Jetmore <jj33\@pobox.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -97,7 +97,7 @@
&& !$G::msg_ids->{$m->{message}});
if (!$e->parse_message($m->{message})) {
warn "Couldn't parse $m->{message}: ".$e->error()."\n";
- next(MSG);
+ next MSG;
}
$tcount++;
my $match = 0;
@@ -119,19 +119,19 @@
}
if ($@) {
print STDERR "Error in eval '$c->{cmp}': $@\n";
- next(MSG);
+ next MSG;
} elsif ($ret) {
$match = 1;
- if ($G::or) { last(CRITERIA); }
- else { next(CRITERIA); }
+ if ($G::or) { last CRITERIA; }
+ else { next CRITERIA; }
} else { # no match
- if ($G::or) { next(CRITERIA); }
- else { next(MSG); }
+ if ($G::or) { next CRITERIA; }
+ else { next MSG; }
}
}
# skip this message if any criteria were supplied and it didn't match
- next(MSG) if ((scalar(@$crit) || scalar(@local_crit)) && !$match);
+ next MSG if ((scalar(@$crit) || scalar(@local_crit)) && !$match);
if ($count_only) {
$mcount++;
@@ -141,7 +141,7 @@
}
if ($G::mailq_bpc) {
- print "$tcount\n";
+ print "$mcount\n";
} elsif ($G::qgrep_c) {
print "$mcount matches out of $tcount messages\n";
}
@@ -610,7 +610,12 @@
my $bytes = $_;
return(0) if (read(I, $_, $bytes) != $bytes);
chomp(); # may regret this later
- $self->{_vars}{message_linecount} += scalar(split(/\n/)) if ($t ne '*');
+ if ($t ne '*') {
+ # use of this temp variable is a little lame but it prevents a
+ # -w warning (Use of implicit split to @_ is deprecated)
+ my @t = split(/\n/);
+ $self->{_vars}{message_linecount} += scalar(@t);
+ }
# build the $header_ variable, following exim's rules (sort of)
if (/^([^ :]+):(.*)$/s) {
my $v = "header_" . lc($1);
