Fix unescaped From in bugreport (closes: #983847)

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 088f43b874c24dc6fd9c8ce1599bac32ac4489ba..9969abbef09614263ed58c1aed6290dd9653b894 100755 (executable)
--- 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);
 
@@ -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;