X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=c56a40190be02ffc95addb58b31b092f0aebb1c0;hp=0caab302ff47ee2ca9cc4b8953573f31328ae46a;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=682962d94b21e120c78a52a8bdcb6aa994330a14 diff --git a/uip/sortm.c b/uip/sortm.c index 0caab30..c56a401 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,24 +25,24 @@ static struct swit switches[] = { #define TEXTSW 1 { "textfield field", 0 }, #define NSUBJSW 2 - { "notextfield", 0 }, -#define SUBJSW 3 - { "subject", -3 }, /* backward-compatibility */ -#define LIMSW 4 + { "notextfield", 2 }, +#define LIMSW 3 { "limit days", 0 }, -#define NLIMSW 5 - { "nolimit", 0 }, -#define VERBSW 6 +#define NLIMSW 4 + { "nolimit", 2 }, +#define VERBSW 5 { "verbose", 0 }, -#define NVERBSW 7 - { "noverbose", 0 }, -#define VERSIONSW 8 - { "version", 0 }, -#define HELPSW 9 +#define NVERBSW 6 + { "noverbose", 2 }, +#define VERSIONSW 7 + { "Version", 0 }, +#define HELPSW 8 { "help", 0 }, { NULL, 0 } }; +char *version=VERSION; + struct smsg { int s_msg; time_t s_clock; @@ -43,8 +52,8 @@ struct smsg { static struct smsg *smsgs; int nmsgs; -char *subjsort = (char *) 0; /* sort on subject if != 0 */ -unsigned long datelimit = 0; +char *subjsort = NULL; /* sort on subject if != 0 */ +time_t datelimit = 0; int submajor = 0; /* if true, sort on subject-major */ int verbose; @@ -75,9 +84,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 */ @@ -94,44 +101,41 @@ 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; - case SUBJSW: - subjsort = "subject"; - continue; case NSUBJSW: - subjsort = (char *)0; + subjsort = NULL; continue; 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 */ @@ -139,7 +143,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: @@ -157,15 +161,15 @@ 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)); + folder = mh_xstrdup(expandfol(cp)); } else app_msgarg(&msgs, cp); } if (!msgs.size) - app_msgarg(&msgs, "all"); + app_msgarg(&msgs, seq_all); if (!datesw) datesw = "date"; if (!folder) @@ -173,29 +177,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 = mh_xcalloc(nmsgs+1, sizeof(*dlist)); for (i = 0; i < nmsgs; i++) dlist[i] = &smsgs[i]; dlist[nmsgs] = 0; @@ -220,10 +224,9 @@ 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)); + slist = mh_xcalloc(nmsgs+1, sizeof(*slist)); memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist)); qsort((char *)slist, nmsgs, sizeof(*slist), (qsort_comp) subsort); @@ -233,20 +236,19 @@ 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 = 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]; /* ** make up the final list, chronological but with ** all the same subjects grouped together. */ - flist = (struct smsg **) - mh_xmalloc((nmsgs+1) * sizeof(*flist)); + flist = mh_xcalloc(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) @@ -265,8 +267,8 @@ main(int argc, char **argv) } } *fp = 0; - free(slist); - free(dlist); + mh_free0(&slist); + mh_free0(&dlist); dlist = flist; } @@ -281,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 @@ -290,14 +291,11 @@ 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), - sizeof(*smsgs)); - if (smsgs == NULL) - adios(NULL, "unable to allocate sort storage"); + smsgs = mh_xcalloc(mp->hghsel - mp->lowsel + 2, sizeof(*smsgs)); s = smsgs; for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -321,67 +319,60 @@ 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 LENERR2: + state = FLD2; + /* FALL */ + case FLD2: + if (mh_strcasecmp(f.name, datesw)==0) { + datecomp = mh_xstrdup(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 = mh_xstrdup(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) - free(datecomp); - if (subjcomp) - free(subjcomp); + case FMTERR2: + admonish(NULL, "format error in message %d (header #%d)", msg, compnum); + state = FLD2; + continue; + + case IOERR2: + admonish(NULL, "format error in message %d (header #%d)", msg, compnum); + if (datecomp) { + mh_free0(&datecomp); + } + if (subjcomp) { + mh_free0(&subjcomp); + } fclose(in); return (0); default: - adios(NULL, "internal error -- you lose"); + adios(EX_SOFTWARE, NULL, "internal error -- you lose"); } break; } @@ -408,8 +399,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; @@ -438,7 +429,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg) } fclose(in); if (datecomp) - free(datecomp); + mh_free0(&datecomp); return (1); } @@ -465,7 +456,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); @@ -476,7 +467,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); @@ -509,7 +500,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) @@ -562,13 +553,13 @@ rename_msgs(struct msgs *mp, struct smsg **mlist) ** messages in the folder. */ - (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old); - (void)snprintf(newbuf, sizeof (newbuf), "%s/%d", + snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old); + snprintf(newbuf, sizeof (newbuf), "%s/%d", mp->foldpath, mp->hghmsg + 1); 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); @@ -579,11 +570,11 @@ rename_msgs(struct msgs *mp, struct smsg **mlist) ** to the real place. */ - (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new); + snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new); 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;