[exim-cvs] Exipick: reorder chomp

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Exipick: reorder chomp
Gitweb: https://git.exim.org/exim.git/commitdiff/67fd284beb503f7895deee203bf7bd2df2c994cc
Commit:     67fd284beb503f7895deee203bf7bd2df2c994cc
Parent:     2156b9e96e10dba65081dbc688a98bf42c26d868
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Fri Nov 15 00:11:29 2019 +0800
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Sat Nov 16 10:28:38 2019 +0800


    Exipick: reorder chomp
---
 src/src/exipick.src | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


diff --git a/src/src/exipick.src b/src/src/exipick.src
index e121c99..a631333 100644
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -25,6 +25,7 @@ my $p_version = "20100323.0";
 my $p_usage   = "Usage: $p_name [--help|--man|--version] (see --help for details)";
 my $p_cp      = <<EOM;
         Copyright (c) 2003-2010 John Jetmore <jj33\@pobox.com>
+        Copyright (c) 2019 The Exim Maintainers


     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
@@ -903,8 +904,8 @@ sub _parse_header {
   $self->{_vars}{message_age}      = time() - $self->{_vars}{received_time};


   TAGGED: while (<I>) {
-    chomp;
     my ($tag, $arg) = /^-?(-\S+)(?:\s+(.*))?$/ or last TAGGED;
+    chomp;


     if ($tag eq '-acl') {
       my $t;
@@ -1007,6 +1008,7 @@ sub _parse_header {
   # when we drop out of the while loop, we have the first line of the
   # delivered tree in $_
   do {
+    chomp;
     if ($_ eq 'XX') {
       ; # noop
     } elsif ($_ =~ s/^[YN][YN]\s+//) {
@@ -1014,7 +1016,7 @@ sub _parse_header {
     } else {
       return(0);
     }
-    chomp($_ = <I>);
+    $_ = <I>;
   } while ($_ !~ /^\d+$/);


$self->{_numrecips} = $_;