{ "file name", 0 },
#define FORMSW 5
{ "form formatfile", 0 },
-#define FMTSW 6
- { "format string", 5 },
-#define SILSW 7
+#define SILSW 6
{ "silent", 0 },
-#define NSILSW 8
+#define NSILSW 7
{ "nosilent", 0 },
-#define TRNCSW 9
+#define TRNCSW 8
{ "truncate", 0 },
-#define NTRNCSW 10
+#define NTRNCSW 9
{ "notruncate", 0 },
-#define WIDTHSW 11
+#define WIDTHSW 10
{ "width columns", 0 },
-#define VERSIONSW 12
+#define VERSIONSW 11
{ "version", 0 },
-#define HELPSW 13
+#define HELPSW 12
{ "help", 0 },
};
** not truncate mailspool
*/
char *cp, *maildir = NULL, *folder = NULL;
- char *format = NULL, *form = 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 (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- form = NULL;
continue;
case WIDTHSW:
#endif /* MHE */
/* Get new format string */
- nfs = new_fs(form, format, NULL, FORMAT);
+ fmtstr = new_fs(form, FORMAT);
if (noisy) {
printf("Incorporating new mail into %s...\n\n", folder);
}
/* create scanline for new message */
- switch (incerr = scan(in, msgnum + 1, msgnum + 1, nfs, width,
- msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+ switch (incerr = scan(in, msgnum + 1, msgnum + 1,
+ noisy ? fmtstr : NULL, width,
+ msgnum == hghnum && chgflag, 1)) {
case SCNFAT:
case SCNEOF:
break;
break;
case SCNMSG:
- case SCNENC:
/*
** Run the external program hook on the message.
*/