add mdeliver.1

3 files changed, 107 insertions, 16 deletions

diff --git a/README b/README
index e454722..5d117eb 100644
--- a/README
+++ b/README
@@ -11,21 +11,22 @@ DESCRIPTION
      but its is a complete implementation from scratch.
 
      Santoku consists of a set of Unix tools that each do one job:
-     maddr(1)    to extract addresses from mail
-     mcomp(1)    to write and send mail
-     mdirs(1)    to find Maildirs
-     mflag(1)    to change flags (marks) of mail
-     mhdr(1)     to extract mail headers
-     minc(1)     to incorporate new mail
-     mless(1)    to conveniently read mail in less(1)
-     mlist(1)    to list and filter mail messages
-     mmime(1)    to create MIME messages
-     mrepl(1)    to reply to mail
-     mscan(1)    to generate single line summaries of mail
-     mseq(1)     to manipulate mail sequences
-     mshow(1)    to render mail and extract attachments
-     msort(1)    to sort mail
-     mthread(1)  to arrange mail into discussions
+     maddr(1)     to extract addresses from mail
+     mcomp(1)     to write and send mail
+     mdeliver(1)  to deliver messages or import mailboxes
+     mdirs(1)     to find Maildirs
+     mflag(1)     to change flags (marks) of mail
+     mhdr(1)      to extract mail headers
+     minc(1)      to incorporate new mail
+     mless(1)     to conveniently read mail in less(1)
+     mlist(1)     to list and filter mail messages
+     mmime(1)     to create MIME messages
+     mrepl(1)     to reply to mail
+     mscan(1)     to generate single line summaries of mail
+     mseq(1)      to manipulate mail sequences
+     mshow(1)     to render mail and extract attachments
+     msort(1)     to sort mail
+     mthread(1)   to arrange mail into discussions
 
 PRINCIPLES
      Santoku is a classic command line MUA with no features related to
diff --git a/man/mdeliver.1 b/man/mdeliver.1
new file mode 100644
index 0000000..6fc6bdb
--- /dev/null
+++ b/man/mdeliver.1
@@ -0,0 +1,88 @@
+.Dd July 26, 2016
+.Dt MDELIVER 1
+.Os
+.Sh NAME
+.Nm mdeliver
+.Nd deliver message or mailbox into Maildir
+.Sh SYNOPSIS
+.Nm
+.Op Fl n
+.Op Fl v
+.Op Fl X Ar flags
+.Ar dir
+<
+.Ar message
+.Nm
+.Fl M
+.Op Fl n
+.Op Fl v
+.Op Fl X Ar flags
+.Ar dir
+<
+.Ar mbox
+.Sh DESCRIPTION
+.Nm
+adds a the message given on standard input as a new message
+into the Maildir
+.Ar dir .
+.Pp
+When
+.Fl M
+is used,
+.Nm
+will regard standard input as
+a MBOXRD mailbox, split it on
+.Dq Li "From "
+and deliver each message,
+decoding it according to the MBOXRD convention.
+Also,
+.Nm
+will set the mtime according to the value of
+.Sq Li "Date:"
+and the Maildir flags according to the value of
+.Sq Li "Status:"
+or
+.Sq Li "X-Status:" .
+.Pp
+The messages are delivered in a reliable way and use default
+.Xr umask 2 .
+.Pp
+.Em Beware :
+no syntactical checks are performed on the messages.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl M
+Deliver each message of an mbox.
+.It Fl n
+Deliver messages into
+.Pa new/ ,
+not
+.Pa cur/
+(the default).
+.It Fl v
+Print each message filename after delivery.
+.It Fl X Ar flg
+.Em Override
+the flags of the new message file to be
+.Ar flg .
+.El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr maildir 5 ,
+.Xr mbox 5
+.Pp
+.Lk http://www.digitalpreservation.gov/formats/fdd/fdd000385.shtml "MBOXRD Email Format"
+.Sh AUTHORS
+.An Christian Neukirchen Aq Mt chneukirchen@gmail.com
+.Sh LICENSE
+.Nm
+is in the public domain.
+.Pp
+To the extent possible under law,
+the creator of this work
+has waived all copyright and related or
+neighboring rights to this work.
+.Pp
+.Lk http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/man/mintro.7 b/man/mintro.7
index 622cf20..d8dd0c0 100644
--- a/man/mintro.7
+++ b/man/mintro.7
@@ -18,11 +18,13 @@ System, but its is a complete implementation from scratch.
 .Pp
 .N2
 consists of a set of Unix tools that each do one job:
-.Bl -tag -width two-indent -compact
+.Bl -tag -width 11n -compact
 .It Xr maddr 1
 to extract addresses from mail
 .It Xr mcomp 1
 to write and send mail
+.It Xr mdeliver 1
+to deliver messages or import mailboxes
 .It Xr mdirs 1
 to find Maildirs
 .It Xr mflag 1