Skip to content

Add option to create mbox-style output readable by MIME-capable mail readers #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to create mbox-style output readable by MIME-capable mail readers #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions smqdecode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,18 @@ sub dumpmeta {
return 1;
} # dumpmeta

# Print fromline
#

sub dumpfromline {
my $qf = shift;
my $sender = $qf->{qe}->{S};
my $ftime = $qf->{qe}->{T};

print "From ", $sender, " ", strftime( '%a %b %d %T %Y', localtime( $ftime ) ), "\n";
}


# Dump headers
#
# $qf->dumpheaders( $flags, [$ofh], $raw )
Expand Down Expand Up @@ -1060,7 +1072,7 @@ unless( __FILE__ =~ /\.pm$/ ) {

my( $meta, $headers, $body, $transcript, $raw,
$flags, $limit, $debug, $submit, $delete,
$help, $man, $version, );
$help, $man, $version, $mbox, );

my %opts = ( type => qr/[q]/ );

Expand All @@ -1081,9 +1093,10 @@ unless( __FILE__ =~ /\.pm$/ ) {
'transcript|t!' => \$transcript,
'version' => \$version,
'warnings|w!' => \$opts{warn},
'message|M!' => sub { $headers = $body = $_[1]; undef $limit if( $_[1] ); },
'limit-body|l=s' => sub { $limit = _matchnum( @_ ) },
'type|T=s' => sub {
'message|M!' => sub { $headers = $body = $_[1]; undef $limit if( $_[1] ); },
'mbox|F!' => sub { $mbox = $headers = $body = $_[1]; undef $limit if( $_[1] ); },
'limit-body|l=s' => sub { $limit = _matchnum( @_ ) },
'type|T=s' => sub {
$opts{type} = _matchval( @_[ 0, 1 ],
all => qr/[qht]/,
pended => qr/[q]/,
Expand Down Expand Up @@ -1123,7 +1136,7 @@ unless( __FILE__ =~ /\.pm$/ ) {

my $sep = "";
foreach my $f ( $smq->entries ) {
if( $smq->entries > 1 || $debug ) {
if( (not $mbox) && ( $smq->entries > 1 || $debug )) {
print( $sep );
$sep = "\n";
print( '# ', '-' x 80, "\n" );
Expand All @@ -1134,13 +1147,15 @@ unless( __FILE__ =~ /\.pm$/ ) {
next unless( $qf );

$qf->dumpmeta if( $meta );
if( $headers ) {
if( $headers || $mbox ) {
print( "\n" ) if( $meta );
$qf->dumpfromline if( $mbox );
$qf->dumpheaders( $flags, undef, $raw );
}
if( $body ) {
if( $body || $mbox ) {
print( "\n" ) if( $meta || $headers );
$qf->dumpbody( $limit );
print( "\n" ) if( $mbox );
}
if( $transcript && $qf->has_transcript ) {
print( "\n" ) if( $meta || $headers || $body );
Expand Down Expand Up @@ -1299,6 +1314,14 @@ They apply only to the preceding header.
Note that this produces output that does not conform to the
e-mail message format standards.

=item B<-F> B<--mbox>

Output headers and full message body in mbox format, similar to -M, but
without any queue file name separators between messages. This option adds an
mbox-style "From " line at the beginning of the headers, and a newline at the
end of the body. When stdout is redirected to a file, this makes the messages
readable by, e.g. mutt, or other mime-aware mail readers.

=item B<-h> B<--headers>

Output the message headers, formatted for message delivery.
Expand All @@ -1320,7 +1343,7 @@ Display complete usage information.

=item B<-M> B<--message>

Output both body and message, Shortcut for --headers --body --limit=none.
Output both headers and full message body. Shortcut for --headers --body --limit=none.

=item B<-m> B<--metadata>

Expand Down