X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c8f419afe4b673ce93b7db07eb3093d8a07afb5f..481eeb93961ef9998901c522b498253d75124fb4:/src/src/eximstats.src

diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 5e1a0847b..232b3d135 100644
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -1,7 +1,9 @@
 #!PERL_COMMAND
 
+# Copyright (c) The Exim Maintainers 2023
 # Copyright (c) 2001-2017 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # Perl script to generate statistics from one or more Exim log files.
 
@@ -557,7 +559,7 @@ use File::Basename;
 # use Time::Local;  # PH/FANF
 use POSIX;
 
-if (@ARGV and $ARGV[0] eq '--version') {
+if (@ARGV and ($ARGV[0] eq '--version' || $ARGV[0] eq '-v')) {
     print basename($0) . ": $0\n",
         "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
         "perl(runtime): $]\n";
@@ -1898,7 +1900,11 @@ sub generate_parser {
       next if ($length < 38 + $extra);
     }
 
-    $id   = substr($_, 20 + $extra, 16);
+    # $id = substr($_, 20 + $extra, 16);	# old ID was 16 chars
+    $id = substr($_, 20 + $extra, 23);		# new IS is 23 chars
+    $id =~ s/(\S+).*/$1/;
+    $extra += length($id) - 16;
+
     $flag = substr($_, 37 + $extra, 2);
 
     if ($flag !~ /^([<>=*-]+|SA)$/ && /rejected|refused|dropped/) {