X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=2fbb9b654e1e791c5f359ad768bf49846a5d3697;hb=68a686adeb39223a5e1ad35e4a24890ec053679d;hp=05df0f02d07b0f44df6c93a16e2bbdce786b8ea1;hpb=43ea5347b6b445d926082d6e3c1ddec376e8692d;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 05df0f0..2fbb9b6 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -64,6 +64,7 @@ static struct swit switches[] = { { "version", 0 }, #define HELPSW 12 { "help", 0 }, + { NULL, 0 }, }; /* @@ -294,16 +295,7 @@ main(int argc, char **argv) if ((maildir_copy = strdup(maildir)) == NULL) adios(maildir, "error allocating memory to copy maildir"); - if (!folder_exists(maildir)) { - /* - ** If the folder doesn't exist, and we're given the -silent - ** flag, just fail. - */ - if (noisy) - create_folder(maildir, 0, done); - else - done(1); - } + create_folder(maildir, noisy ? 0 : 1, done); if (chdir(maildir) == NOTOK) adios(maildir, "unable to change directory to"); @@ -346,7 +338,7 @@ main(int argc, char **argv) chmod(audfile, m_gmprot()); fprintf(aud, from ? "<> %s -ms %s\n" : "<> %s\n", - dtimenow(0), from); + dtimenow(), from); } #ifdef MHE @@ -374,7 +366,7 @@ main(int argc, char **argv) /* ** Get the mail from file (usually mail spool) */ - m_unknown(in); /* the MAGIC invocation... */ + thisisanmbox(in); hghnum = msgnum = mp->hghmsg; for (;;) { /* @@ -446,6 +438,7 @@ main(int argc, char **argv) */ break; } + free(maildir_copy); if (incerr < 0) { /* error */ if (locked) {