projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle more of the new format version numbers
[exim.git]
/
src
/
src
/
exiqgrep.src
diff --git
a/src/src/exiqgrep.src
b/src/src/exiqgrep.src
index 9abaab787f4c85b42c12d4016061cd6169468c56..75265a2bb37ed0e277c521984ddd7d8bdc0fad71 100644
(file)
--- a/
src/src/exiqgrep.src
+++ b/
src/src/exiqgrep.src
@@
-1,5
+1,4
@@
#!PERL_COMMAND
#!PERL_COMMAND
-# $Cambridge: exim/src/src/exiqgrep.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
# Utility for searching and displaying queue information.
# Written by Matt Hubbard 15 August 2002
# Utility for searching and displaying queue information.
# Written by Matt Hubbard 15 August 2002
@@
-88,7
+87,7
@@
sub collect() {
chomp();
my $line = $_;
#Should be 1st line of record, if not error.
chomp();
my $line = $_;
#Should be 1st line of record, if not error.
- if ($line =~ /^\s*(\w+)\s+(
\S+)\s+
(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
+ if ($line =~ /^\s*(\w+)\s+(
(?:\d+(?:\.\d+)?[A-Z]?)?)\s*
(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
my $msg = $3;
$id{$msg}{age} = $1;
$id{$msg}{size} = $2;
my $msg = $3;
$id{$msg}{age} = $1;
$id{$msg}{size} = $2;