X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=43dc7dc0bbed6cdef9623293e9a06e63754e4146;hp=9e96d5a4cde0896f9a8a19aa050b51f67612c7d8;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=00140a3c86e9def69d98ba2ffd4d6e50ef6326ea diff --git a/uip/sortm.c b/uip/sortm.c index 9e96d5a..43dc7dc 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -9,6 +9,15 @@ #include #include #include +#include +#include +#include +#include +#include + +#ifdef HAVE_SYS_PARAM_H +# include +#endif static struct swit switches[] = { #define DATESW 0 @@ -16,15 +25,15 @@ static struct swit switches[] = { #define TEXTSW 1 { "textfield field", 0 }, #define NSUBJSW 2 - { "notextfield", 0 }, + { "notextfield", 2 }, #define LIMSW 3 { "limit days", 0 }, #define NLIMSW 4 - { "nolimit", 0 }, + { "nolimit", 2 }, #define VERBSW 5 { "verbose", 0 }, #define NVERBSW 6 - { "noverbose", 0 }, + { "noverbose", 2 }, #define VERSIONSW 7 { "Version", 0 }, #define HELPSW 8 @@ -73,9 +82,7 @@ main(int argc, char **argv) struct msgs *mp; struct smsg **dlist; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -92,31 +99,31 @@ 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 DATESW: if (datesw) - adios(NULL, "only one date field at a time"); + adios(EX_USAGE, NULL, "only one date field at a time"); if (!(datesw = *argp++) || *datesw == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; case TEXTSW: if (subjsort) - adios(NULL, "only one text field at a time"); + adios(EX_USAGE, NULL, "only one text field at a time"); if (!(subjsort = *argp++) || *subjsort == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; @@ -126,7 +133,7 @@ main(int argc, char **argv) case LIMSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", argp[-2]); + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); while (*cp == '0') cp++; /* skip any leading zeros */ if (!*cp) { /* hit end of string */ @@ -134,7 +141,7 @@ main(int argc, char **argv) continue; } if (!isdigit(*cp) || !(datelimit = atoi(cp))) - adios(NULL, "impossible limit %s", cp); + adios(EX_USAGE, NULL, "impossible limit %s", cp); datelimit *= 60*60*24; continue; case NLIMSW: @@ -152,7 +159,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 @@ -168,29 +175,29 @@ 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 */ if ((nmsgs = read_hdrs(mp, datesw)) <= 0) - adios(NULL, "no messages to sort"); + adios(EX_DATAERR, NULL, "no messages to sort"); /* ** sort a list of pointers to our "messages to be sorted". */ - dlist = (struct smsg **) mh_xmalloc((nmsgs+1) * sizeof(*dlist)); + dlist = (struct smsg **) mh_xcalloc((size_t) (nmsgs+1), sizeof(*dlist)); for (i = 0; i < nmsgs; i++) dlist[i] = &smsgs[i]; dlist[nmsgs] = 0; @@ -215,7 +222,7 @@ main(int argc, char **argv) */ if (!submajor && subjsort) { /* already date sorted */ struct smsg **slist, **flist; - register struct smsg ***il, **fp, **dp; + struct smsg ***il, **fp, **dp; slist = (struct smsg **) mh_xmalloc((nmsgs+1) * sizeof(*slist)); @@ -228,9 +235,9 @@ main(int argc, char **argv) ** the collection of messages with the same subj ** given a message number. */ - il = (struct smsg ***) calloc(mp->hghsel+1, sizeof(*il)); + il = (struct smsg ***) mh_xcalloc(mp->hghsel+1, sizeof(*il)); if (! il) - adios(NULL, "couldn't allocate msg list"); + adios(EX_OSERR, NULL, "couldn't allocate msg list"); for (i = 0; i < nmsgs; i++) il[slist[i]->s_msg] = &slist[i]; /* @@ -241,7 +248,7 @@ main(int argc, char **argv) mh_xmalloc((nmsgs+1) * sizeof(*flist)); fp = flist; for (dp = dlist; *dp;) { - register struct smsg **s = il[(*dp++)->s_msg]; + struct smsg **s = il[(*dp++)->s_msg]; /* see if we already did this guy */ if (! s) @@ -276,8 +283,7 @@ main(int argc, char **argv) seq_save(mp); /* synchronize message sequences */ context_save(); /* save the context file */ folder_free(mp); /* free folder/message structure */ - done(0); - return 1; + return 0; } static int @@ -285,14 +291,12 @@ read_hdrs(struct msgs *mp, char *datesw) { int msgnum; struct tws tb; - register struct smsg *s; + struct smsg *s; twscopy(&tb, dlocaltimenow()); - smsgs = (struct smsg *) calloc((size_t) (mp->hghsel - mp->lowsel + 2), + smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2), sizeof(*smsgs)); - if (smsgs == NULL) - adios(NULL, "unable to allocate sort storage"); s = smsgs; for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -316,67 +320,54 @@ read_hdrs(struct msgs *mp, char *datesw) static int get_fields(char *datesw, int msg, struct smsg *smsg) { - register int state; + enum state state; + struct field f = {{0}}; int compnum; - char *msgnam, buf[BUFSIZ], nam[NAMESZ]; - register struct tws *tw; - register char *datecomp = NULL, *subjcomp = NULL; - register FILE *in; + char *msgnam; + struct tws *tw; + char *datecomp = NULL, *subjcomp = NULL; + FILE *in; if ((in = fopen(msgnam = m_name(msg), "r")) == NULL) { admonish(msgnam, "unable to read message"); return (0); } - for (compnum = 1, state = FLD;;) { - switch (state = m_getfld(state, nam, buf, sizeof(buf), in)) { - case FLD: - case FLDEOF: - case FLDPLUS: - compnum++; - if (!mh_strcasecmp(nam, datesw)) { - datecomp = add(buf, datecomp); - while (state == FLDPLUS) { - state = m_getfld(state, nam, buf, - sizeof(buf), in); - datecomp = add(buf, datecomp); - } - if (!subjsort || subjcomp) + for (compnum = 1, state = FLD2;; compnum++) { + switch (state = m_getfld2(state, &f, in)) { + case FLD2: + if (mh_strcasecmp(f.name, datesw)==0) { + datecomp = getcpy(f.value); + if (!subjsort || subjcomp) { break; - } else if (subjsort && !mh_strcasecmp(nam, subjsort)) { - subjcomp = add(buf, subjcomp); - while (state == FLDPLUS) { - state = m_getfld(state, nam, buf, - sizeof(buf), in); - subjcomp = add(buf, subjcomp); } - if (datecomp) + } else if (subjsort && mh_strcasecmp(f.name, + subjsort)==0) { + subjcomp = getcpy(f.value); + if (datecomp) { break; - } else { - /* just flush this guy */ - while (state == FLDPLUS) - state = m_getfld(state, nam, buf, - sizeof(buf), in); + } } continue; - case BODY: - case BODYEOF: - case FILEEOF: + case BODY2: + case FILEEOF2: break; - case LENERR: - case FMTERR: - if (state == LENERR || state == FMTERR) - admonish(NULL, "format error in message %d (header #%d)", msg, compnum); - if (datecomp) + case LENERR2: + case FMTERR2: + case ERR2: + admonish(NULL, "format error in message %d (header #%d)", msg, compnum); + if (datecomp) { free(datecomp); - if (subjcomp) + } + if (subjcomp) { free(subjcomp); + } fclose(in); return (0); default: - adios(NULL, "internal error -- you lose"); + adios(EX_SOFTWARE, NULL, "internal error -- you lose"); } break; } @@ -403,8 +394,8 @@ get_fields(char *datesw, int msg, struct smsg *smsg) ** leading "re:", everything but letters & smash ** letters to lower case. */ - register char *cp, *cp2; - register unsigned char c; + char *cp, *cp2; + unsigned char c; cp = subjcomp; cp2 = subjcomp; @@ -460,7 +451,7 @@ dsort(struct smsg **a, struct smsg **b) static int subsort(struct smsg **a, struct smsg **b) { - register int i; + int i; if ((i = strcmp((*a)->s_subj, (*b)->s_subj))) return (i); @@ -471,7 +462,7 @@ subsort(struct smsg **a, struct smsg **b) static int txtsort(struct smsg **a, struct smsg **b) { - register int i; + int i; if ((i = strcmp((*a)->s_subj, (*b)->s_subj))) return (i); @@ -504,7 +495,7 @@ rename_chain(struct msgs *mp, struct smsg **mlist, int msg, int endmsg) ext_hook("ref-hook", oldname, newbuf); if (rename(oldname, newname) == NOTOK) - adios(newname, "unable to rename %s to", oldname); + adios(EX_IOERR, newname, "unable to rename %s to", oldname); copy_msg_flags(mp, new, old); if (mp->curmsg == old) @@ -563,7 +554,7 @@ rename_msgs(struct msgs *mp, struct smsg **mlist) ext_hook("ref-hook", f1, newbuf); if (rename(f1, tmpfil) == NOTOK) - adios(tmpfil, "unable to rename %s to ", f1); + adios(EX_IOERR, tmpfil, "unable to rename %s to ", f1); get_msg_flags(mp, &tmpset, old); @@ -578,7 +569,7 @@ rename_msgs(struct msgs *mp, struct smsg **mlist) ext_hook("ref-hook", newbuf, f1); if (rename(tmpfil, m_name(new)) == NOTOK) - adios(m_name(new), "unable to rename %s to", tmpfil); + adios(EX_IOERR, m_name(new), "unable to rename %s to", tmpfil); set_msg_flags(mp, &tmpset, new); mp->msgflags |= SEQMOD;