X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=9969abbef09614263ed58c1aed6290dd9653b894;hb=79de51023611557f8da946e48b91c4078d63393b;hp=ad35fd509d7d3550d134312112fc18da03c322ca;hpb=2c766f30d6a5ebd253ec96859c5eaff0a6855409;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index ad35fd5..9969abb 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -34,9 +34,12 @@ BEGIN {
     # if the first directory in @INC is not an absolute directory, assume that
     # someone has overridden us via -I.
     if ($INC[0] !~ /^\//) {
+	undef $debbugs_dir;
+    }
+    if (defined $debbugs_dir) {
+	unshift @INC, $debbugs_dir.'/lib/';
     }
 }
-use if defined $debbugs_dir, lib => $debbugs_dir;
 
 use Debbugs::Config qw(:globals :text :config);
 
@@ -66,7 +69,7 @@ if (defined $config{database}) {
 }
 
 use CGI::Simple;
-my $q = new CGI::Simple;
+my $q = CGI::Simple->new();
 # STDOUT should be using the utf8 io layer
 binmode(STDOUT,':raw:encoding(UTF-8)');
 
@@ -326,7 +329,11 @@ END
 	  print map { s/^(>*From )/>$1/; $_."\n" } @lines[ 1 .. $#lines ];
       if ($record->{inner_file}) {
           my $fh = $record->{fh};
-          print $_ while (<$fh>);
+          local $/;
+          while (<$fh>) {
+              s/^(>*From )/>$1/gm;
+              print $_;
+          }
       }
      }
      exit 0;