projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for (un)selection befor (un)set
[mmh]
/
uip
/
repl.c
diff --git
a/uip/repl.c
b/uip/repl.c
index
e5fbc0f
..
c0b290d
100644
(file)
--- a/
uip/repl.c
+++ b/
uip/repl.c
@@
-12,7
+12,11
@@
#include <h/fmt_scan.h>
#include <sys/file.h> /* L_SET */
#include <errno.h>
#include <h/fmt_scan.h>
#include <sys/file.h> /* L_SET */
#include <errno.h>
-
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define GROUPSW 0
static struct swit switches[] = {
#define GROUPSW 0
@@
-157,17
+161,17
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(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] [msg] [switches]", invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s: [+folder] [msg] [switches]", invo_name);
print_help(buf, switches, 1);
- done(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case GROUPSW:
groupreply++;
case GROUPSW:
groupreply++;
@@
-185,27
+189,27
@@
main(int argc, char **argv)
case CCSW:
if (!(cp = *argp++) || *cp == '-')
case CCSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
docc(cp, 1);
continue;
case NCCSW:
if (!(cp = *argp++) || *cp == '-')
argp[-2]);
docc(cp, 1);
continue;
case NCCSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
docc(cp, 0);
continue;
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
argp[-2]);
docc(cp, 0);
continue;
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
case WHATSW:
if (!(whatnowproc = *argp++) ||
*whatnowproc == '-')
argp[-2]);
continue;
case WHATSW:
if (!(whatnowproc = *argp++) ||
*whatnowproc == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
argp[-2]);
continue;
@@
-215,21
+219,21
@@
main(int argc, char **argv)
case FILESW:
if (file)
case FILESW:
if (file)
- adios(NULL, "only one file at a time!");
+ adios(EX_USAGE, NULL, "only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
file = getcpy(expanddir(cp));
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
argp[-2]);
file = getcpy(expanddir(cp));
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
case FILTSW:
if (!(cp = *argp++) || *cp == '-')
argp[-2]);
continue;
case FILTSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
filter = getcpy(etcpath(cp));
continue;
argp[-2]);
filter = getcpy(etcpath(cp));
continue;
@@
-255,12
+259,12
@@
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 {
if (msg)
else
folder = getcpy(expandfol(cp));
} else {
if (msg)
- adios(NULL, "only one message at a time!");
+ adios(EX_USAGE, NULL, "only one message at a time!");
else
msg = cp;
}
else
msg = cp;
}
@@
-276,7
+280,7
@@
main(int argc, char **argv)
cwd = getcpy(pwd());
if (file && (msg || folder))
cwd = getcpy(pwd());
if (file && (msg || folder))
- adios(NULL, "can't mix files and folders/msgs");
+ adios(EX_USAGE, NULL, "can't mix files and folders/msgs");
strncpy(drft, buildsw ? toabsdir("reply") : m_draft(seq_beyond),
sizeof(drft));
strncpy(drft, buildsw ? toabsdir("reply") : m_draft(seq_beyond),
sizeof(drft));
@@
-303,23
+307,23
@@
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 the message range/sequence/name and set SELECTED */
if (!m_convert(mp, msg))
/* parse the message range/sequence/name and set SELECTED */
if (!m_convert(mp, msg))
- done(1);
+ exit(EX_SOFTWARE);
seq_setprev(mp); /* set the previous-sequence */
if (mp->numsel > 1)
seq_setprev(mp); /* set the previous-sequence */
if (mp->numsel > 1)
- adios(NULL, "only one message at a time!");
+ adios(EX_USAGE, NULL, "only one message at a time!");
context_replace(curfolder, folder); /* update current folder */
seq_setcur(mp, mp->lowsel); /* update current message */
context_replace(curfolder, folder); /* update current folder */
seq_setcur(mp, mp->lowsel); /* update current message */
@@
-330,7
+334,7
@@
main(int argc, char **argv)
msg = file ? file : getcpy(m_name(mp->lowsel));
if ((in = fopen(msg, "r")) == NULL)
msg = file ? file : getcpy(m_name(mp->lowsel));
if ((in = fopen(msg, "r")) == NULL)
- adios(msg, "unable to open");
+ adios(EX_IOERR, msg, "unable to open");
/* find form (components) file */
if (!form) {
/* find form (components) file */
if (!form) {
@@
-344,10
+348,9
@@
main(int argc, char **argv)
fclose(in);
if (buildsw)
fclose(in);
if (buildsw)
- done(0);
+ exit(EX_OK);
what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
- done(1);
- return 1;
+ return EX_OSERR;
}
static void
}
static void
@@
-356,9
+359,9
@@
docc(char *cp, int ccflag)
switch (smatch(cp, ccswitches)) {
case AMBIGSW:
ambigsw(cp, ccswitches);
switch (smatch(cp, ccswitches)) {
case AMBIGSW:
ambigsw(cp, ccswitches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
case UNKWNSW:
- adios(NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
+ adios(EX_USAGE, NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
case CTOSW:
ccto = ccflag;
case CTOSW:
ccto = ccflag;
@@
-385,12
+388,12
@@
static void
replout(FILE *inb, char *drft, struct msgs *mp,
int mime, char *form, char *filter)
{
replout(FILE *inb, char *drft, struct msgs *mp,
int mime, char *form, char *filter)
{
- register int state, i;
- register struct comp *cptr;
- register char *tmpbuf;
- register char **nxtbuf;
- register char **ap;
- register struct comp **savecomp;
+ int state, i;
+ struct comp *cptr;
+ char *tmpbuf;
+ char **nxtbuf;
+ char **ap;
+ struct comp **savecomp;
int char_read = 0, format_len, mask;
char name[NAMESZ], *scanl;
unsigned char *cp;
int char_read = 0, format_len, mask;
char name[NAMESZ], *scanl;
unsigned char *cp;
@@
-398,7
+401,7
@@
replout(FILE *inb, char *drft, struct msgs *mp,
mask = umask(~m_gmprot());
if ((out = fopen(drft, "w")) == NULL)
mask = umask(~m_gmprot());
if ((out = fopen(drft, "w")) == NULL)
- adios(drft, "unable to create");
+ adios(EX_CANTCREAT, drft, "unable to create");
umask(mask);
umask(mask);
@@
-410,11
+413,11
@@
replout(FILE *inb, char *drft, struct msgs *mp,
ncomps = fmt_compile(cp, &fmt) + 1;
if (!(nxtbuf = compbuffers = (char **)
ncomps = fmt_compile(cp, &fmt) + 1;
if (!(nxtbuf = compbuffers = (char **)
- calloc((size_t) ncomps, sizeof(char *))))
- adios(NULL, "unable to allocate component buffers");
+ mh_xcalloc((size_t) ncomps, sizeof(char *))))
+ adios(EX_OSERR, NULL, "unable to allocate component buffers");
if (!(savecomp = used_buf = (struct comp **)
if (!(savecomp = used_buf = (struct comp **)
- calloc((size_t) (ncomps+1), sizeof(struct comp *))))
- adios(NULL, "unable to allocate component buffer stack");
+ mh_xcalloc((size_t) (ncomps+1), sizeof(struct comp *))))
+ adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
savecomp += ncomps + 1;
*--savecomp = NULL; /* point at zero'd end minus 1 */
savecomp += ncomps + 1;
*--savecomp = NULL; /* point at zero'd end minus 1 */
@@
-510,7
+513,7
@@
replout(FILE *inb, char *drft, struct msgs *mp,
goto finished;
default:
goto finished;
default:
- adios(NULL, "m_getfld() returned %d", state);
+ adios(EX_SOFTWARE, NULL, "m_getfld() returned %d", state);
}
}
}
}
@@
-524,7
+527,7
@@
finished:
*/
FINDCOMP(cptr, "subject")
if (cptr && (cp = cptr->c_text)) {
*/
FINDCOMP(cptr, "subject")
if (cptr && (cp = cptr->c_text)) {
- register char *sp = cp;
+ char *sp = cp;
for (;;) {
while (isspace(*cp))
for (;;) {
while (isspace(*cp))
@@
-559,14
+562,14
@@
finished:
if (filter) {
fflush(out);
if (ferror(out))
if (filter) {
fflush(out);
if (ferror(out))
- adios(drft, "error writing");
+ adios(EX_IOERR, drft, "error writing");
replfilter(inb, out, filter);
}
fflush(out);
if (ferror(out))
replfilter(inb, out, filter);
}
fflush(out);
if (ferror(out))
- adios(drft, "error writing");
+ adios(EX_IOERR, drft, "error writing");
fclose(out);
if (mime && mp) {
fclose(out);
if (mime && mp) {
@@
-635,13
+638,13
@@
static unsigned int bufsiz=0; /* current size of buf */
char *
formataddr(char *orig, char *str)
{
char *
formataddr(char *orig, char *str)
{
- register int len;
+ int len;
char baddr[BUFSIZ], error[BUFSIZ];
char baddr[BUFSIZ], error[BUFSIZ];
- register int isgroup;
- register char *dst;
- register char *cp;
- register char *sp;
- register struct mailname *mp = NULL;
+ int isgroup;
+ char *dst;
+ char *cp;
+ char *sp;
+ struct mailname *mp = NULL;
/* if we don't have a buffer yet, get one */
if (bufsiz == 0) {
/* if we don't have a buffer yet, get one */
if (bufsiz == 0) {
@@
-707,7
+710,7
@@
static int
insert(struct mailname *np)
{
char buffer[BUFSIZ];
insert(struct mailname *np)
{
char buffer[BUFSIZ];
- register struct mailname *mp;
+ struct mailname *mp;
if (np->m_mbox == NULL)
return 0;
if (np->m_mbox == NULL)
return 0;
@@
-746,14
+749,14
@@
replfilter(FILE *in, FILE *out, char *filter)
return;
if (access(filter, R_OK) == NOTOK)
return;
if (access(filter, R_OK) == NOTOK)
- adios(filter, "unable to read");
+ adios(EX_IOERR, filter, "unable to read");
rewind(in);
lseek(fileno(in), (off_t) 0, SEEK_SET);
switch (pid = fork()) {
case NOTOK:
rewind(in);
lseek(fileno(in), (off_t) 0, SEEK_SET);
switch (pid = fork()) {
case NOTOK:
- adios("fork", "unable to");
+ adios(EX_OSERR, "fork", "unable to");
case OK:
dup2(fileno(in), fileno(stdin));
case OK:
dup2(fileno(in), fileno(stdin));
@@
-767,11
+770,11
@@
replfilter(FILE *in, FILE *out, char *filter)
write(2, "unable to exec mhl: ", 20);
write(2, errstr, strlen(errstr));
write(2, "\n", 1);
write(2, "unable to exec mhl: ", 20);
write(2, errstr, strlen(errstr));
write(2, "\n", 1);
- _exit(-1);
+ _exit(EX_OSERR);
default:
if (pidXwait(pid, "mhl"))
default:
if (pidXwait(pid, "mhl"))
- done(1);
+ exit(EX_SOFTWARE);
fseek(out, 0L, SEEK_END);
break;
}
fseek(out, 0L, SEEK_END);
break;
}