X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvstore.c;fp=uip%2Frcvstore.c;h=83c5150ff51a606824666259e69f9278bd59f947;hp=5fd9ae06df622099567784b322a84c88162c12da;hb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee;hpb=bd02210b2be64956a952f925a2dcd35fb42f6136 diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 5fd9ae0..83c5150 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -50,6 +50,7 @@ static struct swit switches[] = { static char *tmpfilenam = NULL; void unlink_done(); +static void fix_mbox(int out, char *ofile); int main(int argc, char **argv) @@ -179,6 +180,9 @@ main(int argc, char **argv) } chmod(tmpfilenam, m_gmprot()); + /* check if incoming mail is in mbox-format */ + fix_mbox(fd, tmpfilenam); + /* copy the message from stdin into temp file */ cpydata(fileno(stdin), fd, "standard input", tmpfilenam); @@ -230,6 +234,35 @@ main(int argc, char **argv) return EX_OK; } +static void +fix_mbox(int out, char *outfile) +{ + char mbox[5]; + int ret; + + if ((ret = read(fileno(stdin), mbox, sizeof(mbox))) != sizeof(mbox)) { + if (ret == -1) { + adios(EX_IOERR, "standard input", "error reading"); + } + return; + } + + if (strncmp(mbox, "From ", sizeof(mbox))==0) { + do { + if ((ret = read(fileno(stdin), mbox, 1)) != 1) { + if (ret == -1) { + adios(EX_IOERR, "standard input", "error reading"); + } + return; + } + } while (*mbox != '\n'); + } else { + if (write(out, mbox, sizeof(mbox)) != sizeof(mbox)) { + adios(EX_IOERR, outfile, "error writing"); + } + } +} + /* ** Clean up and exit */