X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=3a8342083a57c8caacbde92b48d50fccbddbbaba;hp=085cc7fa7ea3c54a5b206356520bd53277604074;hb=28ce2e7139731b7c8c0bdb67b181f34011e74ed7;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a diff --git a/uip/scan.c b/uip/scan.c index 085cc7f..3a83420 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -12,6 +12,9 @@ #include #include #include +#include +#include +#include static struct swit switches[] = { #define FORMSW 0 @@ -19,7 +22,7 @@ static struct swit switches[] = { #define WIDTHSW 1 { "width columns", 0 }, #define FILESW 2 - { "file file", 4 }, + { "file file", 0 }, #define VERSIONSW 3 { "Version", 0 }, #define HELPSW 4 @@ -41,9 +44,7 @@ main(int argc, char **argv) struct msgs *mp; FILE *in; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -60,34 +61,34 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case FORMSW: if (!(form = *argp++) || *form == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); width = atoi(cp); continue; case FILESW: if (!(cp = *argp++) || (cp[0] == '-' && cp[1])) - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (strcmp(file = cp, "-")!=0) file = getcpy(expanddir(cp)); @@ -96,7 +97,7 @@ main(int argc, char **argv) } if (*cp == '+' || *cp == '@') { if (folder) - adios(NULL, "only one folder at a time!"); + adios(EX_USAGE, NULL, "only one folder at a time!"); else folder = getcpy(expandfol(cp)); } else @@ -113,26 +114,25 @@ main(int argc, char **argv) */ if (file) { if (msgs.size) - adios(NULL, "\"msgs\" not allowed with -file"); + adios(EX_USAGE, NULL, "\"msgs\" not allowed with -file"); if (folder) - adios(NULL, "\"+folder\" not allowed with -file"); + adios(EX_USAGE, NULL, "\"+folder\" not allowed with -file"); /* check if "file" is really stdin */ if (strcmp(file, "-") == 0) { in = stdin; file = "stdin"; } else if (!(in = fopen(file, "r"))) { - adios(file, "unable to open"); + adios(EX_IOERR, file, "unable to open"); } - thisisanmbox(in); for (msgnum = 1; ; ++msgnum) { state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0); if (state != SCNMSG) break; } fclose(in); - done(0); + exit(EX_OK); } /* @@ -146,25 +146,24 @@ main(int argc, char **argv) maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + adios(EX_OSERR, maildir, "unable to change directory to"); - /* read folder and create message structure */ if (!(mp = folder_read(folder))) - adios(NULL, "unable to read folder %s", folder); + adios(EX_IOERR, NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + adios(EX_DATAERR, NULL, "no messages in %s", folder); /* 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); - seq_setprev(mp); /* set the Previous-Sequence */ + exit(EX_USAGE); + seq_setprev(mp); - context_replace(curfolder, folder); /* update current folder */ - seq_save(mp); /* synchronize message sequences */ - context_save(); /* save the context file */ + context_replace(curfolder, folder); + seq_save(mp); + context_save(); /* ** Get the sequence number for each `unseen' sequence @@ -187,43 +186,43 @@ main(int argc, char **argv) } 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"); - continue; - } + if (!is_selected(mp, msgnum)) { + continue; + } - /* - ** Check if message is in any sequence given - ** by Unseen-Sequence profile entry. - */ - unseen = 0; - for (i = 0; i < num_unseen_seq; i++) { - if (in_sequence(mp, seqnum[i], msgnum)) { - unseen = 1; - break; - } - } + if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) { + admonish(cp, "unable to open message"); + continue; + } - switch (state = scan(in, msgnum, SCN_FOLD, fmtstr, - width, msgnum==mp->curmsg, unseen)) { - case SCNMSG: - case SCNERR: + /* + ** Check if message is in any sequence given + ** by Unseen-Sequence profile entry. + */ + unseen = 0; + for (i = 0; i < num_unseen_seq; i++) { + if (in_sequence(mp, seqnum[i], msgnum)) { + unseen = 1; break; + } + } - default: - adios(NULL, "scan() botch(%d)", state); + switch (state = scan(in, msgnum, SCN_FOLD, fmtstr, + width, msgnum==mp->curmsg, unseen)) { + case SCNMSG: + case SCNERR: + break; - case SCNEOF: - advise(NULL, "message %d: empty", msgnum); - break; - } - fclose(in); + default: + adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state); + + case SCNEOF: + advise(NULL, "message %d: empty", msgnum); + break; } + fclose(in); } + folder_free(mp); - folder_free(mp); /* free folder/message structure */ - - done(0); - return 1; + return 0; }