projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates README, INSTALL, and docs/MACHINES
[mmh]
/
uip
/
sortm.c
diff --git
a/uip/sortm.c
b/uip/sortm.c
index
734b63b
..
ae4038d
100644
(file)
--- a/
uip/sortm.c
+++ b/
uip/sortm.c
@@
-13,6
+13,7
@@
#include <ctype.h>
#include <sys/stat.h>
#include <locale.h>
#include <ctype.h>
#include <sys/stat.h>
#include <locale.h>
+#include <sysexits.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
@@
-98,31
+99,31
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- exit(1);
+ exit(EX_USAGE);
case UNKWNSW:
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);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case DATESW:
if (datesw)
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 == '-')
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)
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 == '-')
if (!(subjsort = *argp++) || *subjsort == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
argp[-2]);
continue;
@@
-132,7
+133,7
@@
main(int argc, char **argv)
case LIMSW:
if (!(cp = *argp++) || *cp == '-')
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 */
while (*cp == '0')
cp++; /* skip any leading zeros */
if (!*cp) { /* hit end of string */
@@
-140,7
+141,7
@@
main(int argc, char **argv)
continue;
}
if (!isdigit(*cp) || !(datelimit = atoi(cp)))
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:
datelimit *= 60*60*24;
continue;
case NLIMSW:
@@
-158,7
+159,7
@@
main(int argc, char **argv)
}
if (*cp == '+' || *cp == '@') {
if (folder)
}
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
else
folder = getcpy(expandfol(cp));
} else
@@
-174,29
+175,29
@@
main(int argc, char **argv)
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
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)))
/* 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)
/* 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]))
/* parse all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
- exit(1);
+ exit(EX_USAGE);
seq_setprev(mp); /* set the previous sequence */
if ((nmsgs = read_hdrs(mp, datesw)) <= 0)
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".
*/
/*
** 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;
for (i = 0; i < nmsgs; i++)
dlist[i] = &smsgs[i];
dlist[nmsgs] = 0;
@@
-221,7
+222,7
@@
main(int argc, char **argv)
*/
if (!submajor && subjsort) { /* already date sorted */
struct smsg **slist, **flist;
*/
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 = (struct smsg **)
mh_xmalloc((nmsgs+1) * sizeof(*slist));
@@
-234,9
+235,9
@@
main(int argc, char **argv)
** the collection of messages with the same subj
** given a message number.
*/
** 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)
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];
/*
for (i = 0; i < nmsgs; i++)
il[slist[i]->s_msg] = &slist[i];
/*
@@
-247,7
+248,7
@@
main(int argc, char **argv)
mh_xmalloc((nmsgs+1) * sizeof(*flist));
fp = flist;
for (dp = dlist; *dp;) {
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)
/* see if we already did this guy */
if (! s)
@@
-290,14
+291,14
@@
read_hdrs(struct msgs *mp, char *datesw)
{
int msgnum;
struct tws tb;
{
int msgnum;
struct tws tb;
- register struct smsg *s;
+ struct smsg *s;
twscopy(&tb, dlocaltimenow());
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)
sizeof(*smsgs));
if (smsgs == NULL)
- adios(NULL, "unable to allocate sort storage");
+ adios(EX_OSERR, NULL, "unable to allocate sort storage");
s = smsgs;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
s = smsgs;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@
-321,12
+322,12
@@
read_hdrs(struct msgs *mp, char *datesw)
static int
get_fields(char *datesw, int msg, struct smsg *smsg)
{
static int
get_fields(char *datesw, int msg, struct smsg *smsg)
{
- register int state;
+ int state;
int compnum;
char *msgnam, buf[BUFSIZ], nam[NAMESZ];
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");
if ((in = fopen(msgnam = m_name(msg), "r")) == NULL) {
admonish(msgnam, "unable to read message");
@@
-381,7
+382,7
@@
get_fields(char *datesw, int msg, struct smsg *smsg)
return (0);
default:
return (0);
default:
- adios(NULL, "internal error -- you lose");
+ adios(EX_SOFTWARE, NULL, "internal error -- you lose");
}
break;
}
}
break;
}
@@
-408,8
+409,8
@@
get_fields(char *datesw, int msg, struct smsg *smsg)
** leading "re:", everything but letters & smash
** letters to lower case.
*/
** 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;
cp = subjcomp;
cp2 = subjcomp;
@@
-465,7
+466,7
@@
dsort(struct smsg **a, struct smsg **b)
static int
subsort(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);
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);
@@
-476,7
+477,7
@@
subsort(struct smsg **a, struct smsg **b)
static int
txtsort(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);
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);
@@
-509,7
+510,7
@@
rename_chain(struct msgs *mp, struct smsg **mlist, int msg, int endmsg)
ext_hook("ref-hook", oldname, newbuf);
if (rename(oldname, newname) == NOTOK)
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)
copy_msg_flags(mp, new, old);
if (mp->curmsg == old)
@@
-568,7
+569,7
@@
rename_msgs(struct msgs *mp, struct smsg **mlist)
ext_hook("ref-hook", f1, newbuf);
if (rename(f1, tmpfil) == NOTOK)
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);
get_msg_flags(mp, &tmpset, old);
@@
-583,7
+584,7
@@
rename_msgs(struct msgs *mp, struct smsg **mlist)
ext_hook("ref-hook", newbuf, f1);
if (rename(tmpfil, m_name(new)) == NOTOK)
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;
set_msg_flags(mp, &tmpset, new);
mp->msgflags |= SEQMOD;