X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=671509afa0959d7a654ffceaf5cc1f44244a9e50;hp=1b58eb5b563c692c020e6c1df50a7b2491970637;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=e57b17343dcb3ff373ef4dd089fbe778f0c7c270 diff --git a/uip/scan.c b/uip/scan.c index 1b58eb5..671509a 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,9 +22,9 @@ static struct swit switches[] = { #define WIDTHSW 1 { "width columns", 0 }, #define FILESW 2 - { "file file", 4 }, + { "file file", 0 }, #define VERSIONSW 3 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 4 { "help", 0 }, { NULL, 0 } @@ -31,20 +34,17 @@ static struct swit switches[] = { int main(int argc, char **argv) { - int ontty; 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, buf[BUFSIZ]; - char **argp, *nfs, **arguments; + 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 */ @@ -61,80 +61,77 @@ 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)); + file = mh_xstrdup(expanddir(cp)); continue; } } 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)); + folder = mh_xstrdup(expandfol(cp)); } else app_msgarg(&msgs, cp); } - /* - ** Get new format string. Must be before chdir(). - */ - nfs = new_fs(form, FORMAT); + /* Set format string. Must be before chdir(). */ + fmtstr = new_fs(form, scanformat); /* ** We are scanning a maildrop file */ 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"); } - 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(EX_OK); } /* @@ -148,20 +145,20 @@ 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); + exit(EX_USAGE); seq_setprev(mp); /* set the Previous-Sequence */ context_replace(curfolder, folder); /* update current folder */ @@ -177,19 +174,17 @@ main(int argc, char **argv) if (*cp) { char **ap, *dp; - dp = getcpy(cp); + dp = mh_xstrdup(cp); ap = brkstring(dp, " ", "\n"); for (i = 0; ap && *ap; i++, ap++) { seqnum[i] = seq_getnum(mp, *ap); } num_unseen_seq = i; if (dp) { - free(dp); + mh_free0(&dp); } } - ontty = isatty(fileno(stdout)); - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) { @@ -209,29 +204,24 @@ main(int argc, char **argv) } } - 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; default: - adios(NULL, "scan() botch(%d)", state); + adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state); case SCNEOF: advise(NULL, "message %d: empty", msgnum); break; } fclose(in); - if (ontty) - fflush(stdout); } } folder_free(mp); /* free folder/message structure */ - done(0); - return 1; + return 0; }