#include <h/tws.h>
#include <h/utils.h>
-static struct swit switches[] = {
-#define DATESW 0
- { "datefield field", 0 },
-#define TEXTSW 1
- { "textfield field", 0 },
-#define NSUBJSW 2
- { "notextfield", 0 },
-#define SUBJSW 3
- { "subject", -3 }, /* backward-compatibility */
-#define LIMSW 4
- { "limit days", 0 },
-#define NLIMSW 5
- { "nolimit", 0 },
-#define VERBSW 6
- { "verbose", 0 },
-#define NVERBSW 7
- { "noverbose", 0 },
-#define ALLMSGS 8
- { "all", 0 },
-#define NALLMSGS 9
- { "noall", 0 },
-#define CHECKSW 10
- { "check", 0 },
-#define NCHECKSW 11
- { "nocheck", 0 },
-#define VERSIONSW 12
- { "version", 0 },
-#define HELPSW 13
- { "help", 0 },
- { NULL, 0 }
-};
+#define SORTM_SWITCHES \
+ X("datefield field", 0, DATESW) \
+ X("textfield field", 0, TEXTSW) \
+ X("notextfield", 0, NSUBJSW) \
+ X("subject", -3, SUBJSW) /* backward-compatibility */ \
+ X("limit days", 0, LIMSW) \
+ X("nolimit", 0, NLIMSW) \
+ X("verbose", 0, VERBSW) \
+ X("noverbose", 0, NVERBSW) \
+ X("all", 0, ALLMSGS) \
+ X("noall", 0, NALLMSGS) \
+ X("check", 0, CHECKSW) \
+ X("nocheck", 0, NCHECKSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SORTM);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SORTM, switches);
+#undef X
struct smsg {
int s_msg;
main (int argc, char **argv)
{
int i, msgnum;
- unsigned char *cp;
- char *maildir, *datesw = NULL;
+ char *cp, *maildir, *datesw = NULL;
char *folder = NULL, buf[BUFSIZ], **argp;
char **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct smsg **dlist;
int checksw = 0;
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], 1)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
submajor++; /* sort subject-major */
continue;
}
- if (!isdigit(*cp) || !(datelimit = atoi(cp)))
+ if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp)))
adios (NULL, "impossible limit %s", cp);
datelimit *= 60*60*24;
continue;
adios (maildir, "unable to change directory to");
/* read folder and create message structure */
- if (!(mp = folder_read (folder)))
+ if (!(mp = folder_read (folder, 1)))
adios (NULL, "unable to read folder %s", folder);
/* check for empty folder */
*/
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));
memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
* the collection of messages with the same subj
* given a message number.
*/
- il = (struct smsg ***) calloc (mp->hghsel+1, sizeof(*il));
- if (! il)
- adios (NULL, "couldn't allocate msg list");
+ il = mh_xcalloc(mp->hghsel + 1, sizeof *il);
for (i = 0; i < nmsgs; i++)
il[slist[i]->s_msg] = &slist[i];
/*
flist = (struct smsg **) 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)
}
}
*fp = 0;
+ free (il);
free (slist);
free (dlist);
dlist = flist;
{
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++) {
if (is_selected(mp, msgnum)) {
static int
get_fields (char *datesw, int msg, struct smsg *smsg)
{
- register int state;
+ int state;
int compnum;
char *msgnam, buf[BUFSIZ], nam[NAMESZ];
- register struct tws *tw;
- register char *datecomp = NULL, *subjcomp = NULL;
- register FILE *in;
- m_getfld_state_t gstate;
+ struct tws *tw;
+ char *datecomp = NULL, *subjcomp = NULL;
+ FILE *in;
+ m_getfld_state_t gstate = 0;
if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
admonish (msgnam, "unable to read message");
return (0);
}
- m_getfld_state_init (&gstate);
for (compnum = 1;;) {
int bufsz = sizeof buf;
- switch (state = m_getfld (gstate, nam, buf, &bufsz, in)) {
+ switch (state = m_getfld (&gstate, nam, buf, &bufsz, in)) {
case FLD:
case FLDPLUS:
compnum++;
- if (!mh_strcasecmp (nam, datesw)) {
+ if (!strcasecmp (nam, datesw)) {
datecomp = add (buf, datecomp);
while (state == FLDPLUS) {
bufsz = sizeof buf;
- state = m_getfld (gstate, nam, buf, &bufsz, in);
+ state = m_getfld (&gstate, nam, buf, &bufsz, in);
datecomp = add (buf, datecomp);
}
if (!subjsort || subjcomp)
break;
- } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
+ } else if (subjsort && !strcasecmp (nam, subjsort)) {
subjcomp = add (buf, subjcomp);
while (state == FLDPLUS) {
bufsz = sizeof buf;
- state = m_getfld (gstate, nam, buf, &bufsz, in);
+ state = m_getfld (&gstate, nam, buf, &bufsz, in);
subjcomp = add (buf, subjcomp);
}
if (datecomp)
/* just flush this guy */
while (state == FLDPLUS) {
bufsz = sizeof buf;
- state = m_getfld (gstate, nam, buf, &bufsz, in);
+ state = m_getfld (&gstate, nam, buf, &bufsz, in);
}
}
continue;
if (!datecomp || (tw = dparsetime (datecomp)) == NULL) {
struct stat st;
- admonish (NULL, "can't parse %s field in message %d", datesw, msg);
+ advise (NULL,
+ "can't parse %s field in message %d, "
+ "will use file modification time",
+ datesw, msg);
fstat (fileno (in), &st);
smsg->s_clock = st.st_mtime;
check_failed = 1;
* leading "re:", everything but letters & smash
* letters to lower case.
*/
- register char *cp, *cp2;
- register unsigned char c;
+ char *cp, *cp2, c;
cp = subjcomp;
cp2 = subjcomp;
if (strcmp (subjsort, "subject") == 0) {
while ((c = *cp)) {
- if (! isspace(c)) {
+ if (! isspace((unsigned char) c)) {
if(uprf(cp, "re:"))
cp += 2;
else
}
while ((c = *cp++)) {
- if (isalnum(c))
- *cp2++ = isupper(c) ? tolower(c) : c;
+ if (isascii((unsigned char) c) && isalnum((unsigned char) c))
+ *cp2++ = isupper((unsigned char) c) ?
+ tolower((unsigned char) c) : c;
}
*cp2 = '\0';
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);
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);
rename_msgs (struct msgs *mp, struct smsg **mlist)
{
int i, j, old, new;
- seqset_t tmpset;
+ bvector_t tmpset = bvector_create (0);
char f1[BUFSIZ], tmpfil[BUFSIZ];
char newbuf[PATH_MAX + 1];
struct smsg *sp;
if (rename (f1, tmpfil) == NOTOK)
adios (tmpfil, "unable to rename %s to ", f1);
- get_msg_flags (mp, &tmpset, old);
+ get_msg_flags (mp, tmpset, old);
rename_chain (mp, mlist, j, i);
if (rename (tmpfil, m_name(new)) == NOTOK)
adios (m_name(new), "unable to rename %s to", tmpfil);
- set_msg_flags (mp, &tmpset, new);
+ set_msg_flags (mp, tmpset, new);
mp->msgflags |= SEQMOD;
}
+
+ bvector_free (tmpset);
}
projects / nmh / blobdiff