[project @ 2002-10-18 01:06:41 by cjwatson]

Escape 'From ' lines in message bodies for mbox downloads (#165160).

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index db276a3de632bac88939e2bea37b00b14b730b25..18cf859b2db6aa3ddfff649e3361168082f73681 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -304,14 +304,15 @@ if ( $mbox ) {
                        my $tmp = $lines[ 0 ];
                        $lines[ 0 ] = $lines[ 1 ];
                        $lines[ 1 ] = $tmp;
-                       $_ = join( "\n", @lines ) . "\n";
                }
                if ( !( $lines[ 0 ] =~ m/^From / ) ) {
                        $ENV{ PATH } = "/bin:/usr/bin:/usr/local/bin";
                        my $date = `date "+%a %b %d %T %Y"`;
                        chomp $date;
-                       $_ = "From unknown $date\n" . $_;
+                       unshift @lines, "From unknown $date";
                }
+               map { s/^(>*From )/>$1/ } @lines[ 1 .. $#lines ];
+               $_ = join( "\n", @lines ) . "\n";
        }
        print join("", @mails );
        exit 0;