Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Obey the rmail file and use the unpruned header properly.

Browse source
This commit is contained in:
Pavel Janík 2002-07-05 19:56:34 +00:00
parent e43e5c3e8e
commit 85271e4161
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib-src/b2m.pl
View file

@ -30,7 +30,7 @@
use Date::Parse;
my($whoami) = basename $0;
my($version) = '$Revision: 1.4 $';
my($version) = '$Revision: 1.1 $';
my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
\tBy default, full headers are printed.\n";
@ -62,7 +62,7 @@
while (<>) {
my($msg_num) = $. - 1;
my($labels, $full_header, $header);
my($labels, $pruned, $full_header, $header);
my($from_line, $from_addr);
my($time);
@ -79,7 +79,11 @@
}
$labels = $1;
s/(?:((?:.+\n)+)\n+)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
# Strip the integer indicating whether the header is pruned
$labels =~ s/^(\d+)[,\s]*//;
$pruned = $1;
s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
$full_header = $1;
if (s/((?:.+\n)+)\n+//) {
@ -91,7 +95,10 @@
$_ = '';
}
if (! $full_header) {
# "$pruned eq '0'" is different from "! $pruned". We want to make
# sure that we found a valid label line which explicitly indicated
# that the header was not pruned.
if ((! $full_header) || ($pruned eq '0')) {
$full_header = $header;
}
@ -101,8 +108,6 @@
# Quote "^From "
s/(^|\n)From /$1>From /g;
# Strip the integer indicating whether the header is pruned
$labels =~ s/^\d+[,\s]*//;
# Strip extra commas and whitespace from the end
$labels =~ s/[,\s]+$//;
# Now collapse extra commas and whitespace in the remaining label string