$raw =~ s/^\r?\n\z//ms;
$raw =~ s/$from_re/$1/gms;
my $eml = PublicInbox::Eml->new(\$raw);
- $eml_cb->($eml, @arg);
+ $eml_cb->($eml, @arg) if $eml->raw_size;
}
return if $r == 0; # EOF
}
$$hdr =~ s/\A[\r\n]*From [^\n]*\n//s or
die "E: no 'From ' line in:\n", Dumper($hdr);
my $eml = PublicInbox::Eml->new($hdr);
+ next unless $eml->raw_size;
my @cl = $eml->header_raw('Content-Length');
my $n = scalar(@cl);
$n == 0 and die "E: Content-Length missing in:\n",
# { foo => '' } means "--foo" is passed to the command-line,
# otherwise { foo => '--bar' } passes "--bar"
my %zsfx2cmd = (
- gz => [ qw(GZIP pigz gzip), { rsyncable => '' } ],
+ gz => [ qw(GZIP pigz gzip) ],
bz2 => [ 'bzip2', {} ],
xz => [ 'xz', {} ],
# don't add new entries here unless MUA support is widely available
my ($zsfx, $decompress, $lei) = @_;
my $x = $zsfx2cmd{$zsfx} // die "BUG: no support for suffix=.$zsfx";
my @info = @$x;
- my $cmd_opt = pop @info;
+ my $cmd_opt = ref($info[-1]) ? pop(@info) : undef;
my @cmd = (undef, $decompress ? qw(-dc) : qw(-c));
require PublicInbox::Spawn;
for my $exe (@info) {
$cmd[0] = PublicInbox::Spawn::which($exe) and last;
}
$cmd[0] // die join(' or ', @info)." missing for .$zsfx";
- # push @cmd, @{$cmd_opt->{-default}} if $cmd_opt->{-default};
- for my $bool (qw(rsyncable)) {
- my $switch = $cmd_opt->{rsyncable} // next;
+
+ # not all gzip support --rsyncable, FreeBSD gzip doesn't even exit
+ # with an error code
+ if (!$decompress && $cmd[0] =~ m!/gzip\z! && !defined($cmd_opt)) {
+ pipe(my ($r, $w)) or die "pipe: $!";
+ open my $null, '+>', '/dev/null' or die "open: $!";
+ my $rdr = { 0 => $null, 1 => $null, 2 => $w };
+ my $tst = [ $cmd[0], '--rsyncable' ];
+ my $pid = PublicInbox::Spawn::spawn($tst, undef, $rdr);
+ close $w;
+ my $err = do { local $/; <$r> };
+ waitpid($pid, 0) == $pid or die "BUG: waitpid: $!";
+ $cmd_opt = $err ? {} : { rsyncable => '' };
+ push(@$x, $cmd_opt);
+ }
+ for my $bool (keys %$cmd_opt) {
+ my $switch = $cmd_opt->{$bool} // next;
push @cmd, '--'.($switch || $bool);
}
for my $key (qw(rsyncable)) { # support compression level?