if (folder)
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);
}
/*
** 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;
*/
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);
** 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(EX_OSERR, NULL, "couldn't allocate msg list");
for (i = 0; i < nmsgs; 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)
}
}
*fp = 0;
- free(slist);
- free(dlist);
+ mh_free0(&slist);
+ mh_free0(&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(EX_OSERR, 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++) {
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;
+ 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");
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)) {
continue;
case BODY:
- case BODYEOF:
case FILEEOF:
break;
if (state == LENERR || state == FMTERR)
admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
if (datecomp)
- free(datecomp);
+ mh_free0(&datecomp);
if (subjcomp)
- free(subjcomp);
+ mh_free0(&subjcomp);
fclose(in);
return (0);
** 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;
}
fclose(in);
if (datecomp)
- free(datecomp);
+ mh_free0(&datecomp);
return (1);
}
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);