X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2b83f27e1980a6c5de752bd55c0ff76f53ec15f6..394a751fd883d2bbfc769fed7e254e008a2ef45e:/uip/sortm.c diff --git a/uip/sortm.c b/uip/sortm.c index 0b951bfe..e2b6185c 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -5,10 +5,31 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "sbr/m_name.h" +#include "sbr/m_getfld.h" +#include "sbr/getarguments.h" +#include "sbr/seq_setprev.h" +#include "sbr/seq_setcur.h" +#include "sbr/seq_save.h" +#include "sbr/smatch.h" +#include "sbr/uprf.h" +#include "sbr/m_convert.h" +#include "sbr/getfolder.h" +#include "sbr/ext_hook.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/context_find.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" +#include "h/tws.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define SORTM_SWITCHES \ @@ -46,8 +67,8 @@ int nmsgs; char *subjsort; /* sort on subject if != 0 */ time_t datelimit = 0; -int submajor = 0; /* if true, sort on subject-major */ -int verbose; +bool submajor; /* if true, sort on subject-major */ +bool verbose; int allmsgs = 1; int check_failed = 0; @@ -76,9 +97,9 @@ main (int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; struct smsg **dlist; - int checksw = 0; + bool checksw = false; - if (nmh_init(argv[0], 1)) { return 1; } + if (nmh_init(argv[0], true, true)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -93,7 +114,7 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", @@ -106,16 +127,16 @@ main (int argc, char **argv) case DATESW: if (datesw) - adios (NULL, "only one date field at a time"); + die("only one date field at a time"); if (!(datesw = *argp++) || *datesw == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case TEXTSW: if (subjsort) - adios (NULL, "only one text field at a time"); + die("only one text field at a time"); if (!(subjsort = *argp++) || *subjsort == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case SUBJSW: @@ -127,27 +148,27 @@ main (int argc, char **argv) case LIMSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); while (*cp == '0') cp++; /* skip any leading zeros */ if (!*cp) { /* hit end of string */ - submajor++; /* sort subject-major */ + submajor = true; /* sort subject-major */ continue; } if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp))) - adios (NULL, "impossible limit %s", cp); + die("impossible limit %s", cp); datelimit *= 60*60*24; continue; case NLIMSW: - submajor = 0; /* use date-major, but */ - datelimit = 0; /* use no limit */ + submajor = false; /* use date-major, but */ + datelimit = 0; /* use no limit */ continue; case VERBSW: - verbose++; + verbose = true; continue; case NVERBSW: - verbose = 0; + verbose = false; continue; case ALLMSGS: @@ -158,16 +179,16 @@ main (int argc, char **argv) continue; case CHECKSW: - checksw = 1; + checksw = true; continue; case NCHECKSW: - checksw = 0; + checksw = false; continue; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + die("only one folder at a time!"); folder = pluspath (cp); } else app_msgarg(&msgs, cp); @@ -179,7 +200,7 @@ main (int argc, char **argv) if (allmsgs) { app_msgarg(&msgs, "all"); } else { - adios (NULL, "must specify messages to sort with -noall"); + die("must specify messages to sort with -noall"); } } if (!datesw) @@ -193,11 +214,11 @@ main (int argc, char **argv) /* read folder and create message structure */ if (!(mp = folder_read (folder, 1))) - adios (NULL, "unable to read folder %s", folder); + die("unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + die("no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) @@ -206,16 +227,16 @@ main (int argc, char **argv) seq_setprev (mp); /* set the previous sequence */ if ((nmsgs = read_hdrs (mp, datesw)) <= 0) - adios (NULL, "no messages to sort"); + die("no messages to sort"); if (checksw && check_failed) { - adios (NULL, "errors found, no messages sorted"); + die("errors found, no messages sorted"); } /* * sort a list of pointers to our "messages to be sorted". */ - dlist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*dlist)); + dlist = mh_xmalloc ((nmsgs+1) * sizeof(*dlist)); for (i = 0; i < nmsgs; i++) dlist[i] = &smsgs[i]; dlist[nmsgs] = 0; @@ -231,7 +252,7 @@ main (int argc, char **argv) } /* first sort by date, or by subject-major, date-minor */ - qsort ((char *) dlist, nmsgs, sizeof(*dlist), + qsort (dlist, nmsgs, sizeof(*dlist), (qsort_comp) (submajor && subjsort ? txtsort : dsort)); /* @@ -243,9 +264,9 @@ main (int argc, char **argv) struct smsg **slist, **flist; struct smsg ***il, **fp, **dp; - slist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*slist)); - memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist)); - qsort((char *)slist, nmsgs, sizeof(*slist), (qsort_comp) subsort); + slist = mh_xmalloc ((nmsgs+1) * sizeof(*slist)); + memcpy(slist, dlist, (nmsgs+1)*sizeof(*slist)); + qsort(slist, nmsgs, sizeof(*slist), (qsort_comp) subsort); /* * make an inversion list so we can quickly find @@ -259,7 +280,7 @@ main (int argc, char **argv) * 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_xmalloc ((nmsgs+1) * sizeof(*flist)); fp = flist; for (dp = dlist; *dp;) { struct smsg **s = il[(*dp++)->s_msg]; @@ -397,7 +418,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) return 0; default: - adios (NULL, "internal error -- you lose"); + die("internal error -- you lose"); } break; }