#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/tws.h>
-#include <h/mts.h>
#include <h/utils.h>
#include <errno.h>
static struct swit switches[] = {
-#define CLRSW 0
- { "clear", 0 },
-#define NCLRSW 1
- { "noclear", 0 },
-#define FORMSW 2
+#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 3
- { "format string", 5 },
-#define WIDTHSW 4
+#define WIDTHSW 1
{ "width columns", 0 },
-#define REVSW 5
- { "reverse", 0 },
-#define NREVSW 6
- { "noreverse", 0 },
-#define FILESW 7
- { "file file", 4 },
-#define VERSIONSW 8
- { "version", 0 },
-#define HELPSW 9
+#define FILESW 2
+ { "file file", 0 },
+#define VERSIONSW 3
+ { "Version", 0 },
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
-/*
-** prototypes
-*/
-void clear_screen(void); /* from termsbr.c */
-
-
int
main(int argc, char **argv)
{
- int clearflag = 0, ontty;
- int width = 0, revflag = 0;
+ int width = 0;
int i, state, msgnum;
int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
char *cp, *maildir, *file = NULL, *folder = NULL;
- char *form = NULL, *format = NULL, buf[BUFSIZ];
- char **argp, *nfs, **arguments;
+ char *form = NULL, buf[BUFSIZ];
+ char **argp, *fmtstr, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
FILE *in;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
- done(1);
-
- case CLRSW:
- clearflag++;
- continue;
- case NCLRSW:
- clearflag = 0;
- continue;
+ exit(0);
case FORMSW:
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:
argp[-2]);
width = atoi(cp);
continue;
- case REVSW:
- revflag++;
- continue;
- case NREVSW:
- revflag = 0;
- continue;
case FILESW:
if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
/*
** Get new format string. Must be before chdir().
*/
- nfs = new_fs(form, format, FORMAT);
+ fmtstr = new_fs(form, FORMAT);
/*
** We are scanning a maildrop file
adios(file, "unable to open");
}
- m_unknown(in);
+ thisisanmbox(in);
for (msgnum = 1; ; ++msgnum) {
- state = scan(in, msgnum, -1, nfs, width, 0, 0,
- NULL, 0L, 1);
- if (state != SCNMSG && state != SCNENC)
+ state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0);
+ if (state != SCNMSG)
break;
}
fclose(in);
- done(0);
+ exit(0);
}
/*
/* parse all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
+ exit(1);
seq_setprev(mp); /* set the Previous-Sequence */
context_replace(curfolder, folder); /* update current folder */
}
}
- ontty = isatty(fileno(stdout));
-
- for (msgnum = revflag ? mp->hghsel : mp->lowsel;
- (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
- msgnum += (revflag ? -1 : 1)) {
+ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (is_selected(mp, msgnum)) {
if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
admonish(cp, "unable to open message");
}
}
- switch (state = scan(in, msgnum, 0, nfs, width,
- msgnum == mp->curmsg, unseen,
- folder, 0L, 1)) {
+ switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
+ width, msgnum==mp->curmsg, unseen)) {
case SCNMSG:
- case SCNENC:
case SCNERR:
break;
break;
}
fclose(in);
- if (ontty)
- fflush(stdout);
}
}
folder_free(mp); /* free folder/message structure */
- if (clearflag)
- clear_screen();
- done(0);
- return 1;
+ return 0;
}