char *cp, *maildir = NULL, *folder = NULL;
char *form = NULL;
char *audfile = NULL, *from = NULL;
- char buf[BUFSIZ], **argp, *nfs, **arguments;
+ char buf[BUFSIZ], **argp, *fmtstr, **arguments;
struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
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");
#endif /* MHE */
/* Get new format string */
- nfs = new_fs(form, FORMAT);
+ fmtstr = new_fs(form, FORMAT);
if (noisy) {
printf("Incorporating new mail into %s...\n\n", folder);
/*
** Get the mail from file (usually mail spool)
*/
- m_unknown(in); /* the MAGIC invocation... */
+ thisisanmbox(in);
hghnum = msgnum = mp->hghmsg;
for (;;) {
/*
}
/* create scanline for new message */
- switch (incerr = scan(in, msgnum + 1, msgnum + 1, nfs, width,
- msgnum == hghnum && chgflag, 1, noisy)) {
+ switch (incerr = scan(in, msgnum + 1, msgnum + 1,
+ noisy ? fmtstr : NULL, width,
+ msgnum == hghnum && chgflag, 1)) {
case SCNFAT:
case SCNEOF:
break;