yangtse: curl-www/auto summarize.pl,1.46,1.47

Update of /cvsroot/curl/curl-www/auto
In directory labb:/tmp/cvs-serv27533/auto

Modified Files:
	summarize.pl 
Log Message:
Avoid namespace pollution when using MIME::QuotedPrint.

Avoid redundant comparisons in quoted-printable detection logic.

Index: summarize.pl
===================================================================
RCS file: /cvsroot/curl/curl-www/auto/summarize.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- summarize.pl	23 Feb 2007 22:36:12 -0000	1.46
+++ summarize.pl	24 Feb 2007 04:49:42 -0000	1.47
@@ -1,9 +1,10 @@
 #!/usr/bin/env perl
 
+use MIME::QuotedPrint ();
+
 require "CGI.pm";
 require "../curl.pm";
 require "ccwarn.pm";
-use MIME::QuotedPrint;
 
 opendir(DIR, "inbox");
 my @logs = grep { /^inbox/ } readdir(DIR);
@@ -385,28 +386,16 @@
     # find out if log file is quoted-printable encoded
     my $qpencoded = 0;
     if(open(SCAN, "<$file")) {
-        my $linecount = 0;
-        my $mimecount = 0;
+        my $linecount;
+        my $mimecount;
         while(<SCAN>) {
-            chomp;
-            my $line = $_;
-            $linecount++;
-            if(($mimecount == 0) &&
-               ($line =~ /testcurl: NAME =3D/)) {
-                $mimecount++;
-            }
-            if(($mimecount != 0) &&
-               ($line =~ /testcurl: [A-Z]+ =3D/)) {
-                $mimecount++;
-            }
-            if($linecount > 50) {
-                $qpencoded = 0;
-                last;
-            }
-            if($mimecount > 5) {
-                $qpencoded = 1;
-                last;
+            if($_ =~ /^testcurl: [A-Z]+ =3D/) {
+                if($mimecount++ > 5) {
+                    $qpencoded = 1;
+                    last;
+                }
             }
+            last if($linecount++ > 30);
         }
         close(SCAN);
     }
@@ -416,10 +405,10 @@
     open(READ, "<$file");
     while(my $chunk = <READ>) {
         my $line;
-        # decode quoted printable if encoded
+        # decode quoted-printable if encoded
         if($qpencoded) {
-            $buffer .= decode_qp $chunk;
-            if($buffer =~ /\n/) {
+            $buffer .= MIME::QuotedPrint::decode_qp($chunk);
+            if($buffer =~ /\n$/) {
                 $line = $buffer;
                 $buffer = "";
             }