#define WIDTHSW 10
{ "width columns", 0 },
#define VERSIONSW 11
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 12
{ "help", 0 },
+ { NULL, 0 },
};
/*
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;
/* copy of mail directory because the static gets overwritten */
char *maildir_copy = NULL;
-#ifdef MHE
- FILE *mhe = NULL;
-#endif
-
done=inc_done;
/*
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");
chmod(audfile, m_gmprot());
fprintf(aud, from ? "<<inc>> %s -ms %s\n" : "<<inc>> %s\n",
- dtimenow(0), from);
+ dtimenow(), from);
}
-#ifdef MHE
- if (context_find("mhe")) {
- int i;
- cp = concat(maildir, "/++", NULL);
- i = stat(cp, &st);
- if ((mhe = fopen(cp, "a")) == NULL)
- admonish(cp, "unable to append to");
- else
- if (i == NOTOK)
- chmod(cp, m_gmprot());
- free(cp);
- }
-#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,
- noisy ? nfs : NULL, width,
+ noisy ? fmtstr : NULL, width,
msgnum == hghnum && chgflag, 1)) {
case SCNFAT:
case SCNEOF:
if (aud)
fputs(scanl, aud);
-#ifdef MHE
- if (mhe)
- fputs(scanl, mhe);
-#endif /* MHE */
if (noisy)
fflush(stdout);
msgnum++;
*/
break;
}
+ free(maildir_copy);
if (incerr < 0) { /* error */
if (locked) {
if (aud)
fclose(aud);
-#ifdef MHE
- if (mhe)
- fclose(mhe);
-#endif /* MHE */
-
if (noisy)
fflush(stdout);