svn commit: r1844996 - /spamassassin/trunk/masses/logdiff

[he...@apache.org]

Author: hege
Date: Sun Oct 28 08:02:24 2018
New Revision: 1844996

URL: http://svn.apache.org/viewvc?rev=1844996&view=rev
Log:
Sort input ja clean up tmpfiles

Modified:
    spamassassin/trunk/masses/logdiff

Modified: spamassassin/trunk/masses/logdiff
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/logdiff?rev=1844996&r1=1844995&r2=1844996&view=diff
==============================================================================
--- spamassassin/trunk/masses/logdiff (original)
+++ spamassassin/trunk/masses/logdiff Sun Oct 28 08:02:24 2018
@@ -18,12 +18,16 @@ my $tmp2 = "/tmp/logdiff.$$.2";
 fixfile($l1, $tmp1);
 fixfile($l2, $tmp2);
 
-exec "diff", @diffargs, $tmp1, $tmp2;
+system "diff", @diffargs, $tmp1, $tmp2;
+unlink($tmp1);
+unlink($tmp2);
+exit;
 
 sub fixfile {
   my $inf = shift;
   my $outf = shift;
-  open (IN, "<$inf") or die "cannot open $inf";
+  die "cannot find $inf" unless -f $inf;
+  open (IN, "-|", "sort \"$inf\"") or die "cannot open $inf";
   open (OUT, ">$outf") or die "cannot open $outf";
   while (<IN>) {
     if (!/^([\.Y]\s+\S+\s+\S+)\s+(\S+)\s+(.+)/) {
@@ -45,3 +49,4 @@ sub fixfile {
   close IN;
   close OUT;
 }
+