#include <unistd.h>
#include <sys/stat.h>
#include <locale.h>
+#include <sysexits.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
{ NULL, 0 }
};
+char *version=VERSION;
+
/*
** Options at the "whatnow" prompt
*/
/*
** static prototypes
*/
-static int editfile(char **, char **, char *, int);
+static int editfile(char **, char **, char *);
static int sendfile(char **, char *);
static int refile(char **, char *);
static int removefile(char *);
int
main(int argc, char **argv)
{
- int use = 0;
+ int use = NOUSE;
char *cp;
char *ed = NULL, *drft = NULL;
char buf[BUFSIZ], prompt[BUFSIZ];
*/
if (!getcwd(cwd, sizeof (cwd))) {
- adios("getcwd", "could not get working directory");
+ adios(EX_USAGE, "getcwd", "could not get working directory");
}
while ((cp = *argp++)) {
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- exit(1);
+ exit(EX_USAGE);
case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf),
"%s [switches] [file]",
invo_name);
print_help(buf, switches, 1);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
- exit(0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
case PRMPTSW:
if (!(myprompt = *argp++) || *myprompt == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
}
}
if (drft)
- adios(NULL, "only one draft at a time!");
+ adios(EX_USAGE, NULL, "only one draft at a time!");
else
drft = cp;
}
if ((!drft && !(drft = getenv("mhdraft"))) || !*drft)
- drft = getcpy(m_draft(seq_cur));
+ drft = mh_xstrdup(m_draft(seq_cur));
if ((cp = getenv("mhuse")) && *cp)
use = atoi(cp);
/* start editing the draft, unless editor is the empty string */
if (*ed) {
- if (editfile(&ed, NULL, drft, use) <0) {
+ if (editfile(&ed, NULL, drft) <0) {
if (!use) {
unlink(drft);
}
- advise(NULL, "Try again.");
- /* sysexits.h EX_SOFTWARE */
- exit(1);
+ adios(EX_SOFTWARE, NULL, "Try again.");
}
}
snprintf(prompt, sizeof(prompt), myprompt, invo_name);
- for (;;) {
- if (!(argp = getans(prompt, aleqs))) {
- exit(1);
- }
+ while ((argp = getans(prompt, aleqs))) {
switch (smatch(*argp, aleqs)) {
case DISPSW:
/* display the msg being replied to or distributed */
/* Call an editor on the draft file */
if (*++argp)
ed = *argp++;
- editfile(&ed, argp, drft, NOUSE);
+ editfile(&ed, argp, drft);
break;
case LISTSW:
if (stat(drft, &st) != NOTOK) {
advise(NULL, "draft left on %s", drft);
}
- exit(1);
+ exit(EX_OK);
case DELETESW:
/* Delete draft and exit */
removefile(drft);
- exit(1);
+ exit(EX_OK);
case SENDSW:
/* Send draft */
case REFILEOPT:
/* Refile the draft */
if (refile(++argp, drft) == 0) {
- exit(0);
+ exit(EX_OK);
}
break;
break;
}
}
- /*NOTREACHED*/
+
+ exit(EX_IOERR);
}
*/
int trailln = strlen(trailcmd) + 3;
if (ln < 0 || ln + trailln > bufsz)
- adios(NULL, "arguments too long");
+ adios(EX_USAGE, NULL, "arguments too long");
cp = buf + ln;
ln = strlen(*argp);
/* +1 for leading space */
if (ln + trailln + 1 > bufsz - (cp-buf))
- adios(NULL, "arguments too long");
+ adios(EX_USAGE, NULL, "arguments too long");
*cp++ = ' ';
memcpy(cp, *argp, ln+1);
cp += ln;
char olddir[BUFSIZ];
int r;
if (getcwd(olddir, sizeof(olddir)) == 0)
- adios("getcwd", "could not get working directory");
+ adios(EX_OSERR, "getcwd", "could not get working directory");
if (chdir(dir) != 0)
- adios("chdir", "could not change working directory");
+ adios(EX_OSERR, "chdir", "could not change working directory");
r = system(cmd);
if (chdir(olddir) != 0)
- adios("chdir", "could not change working directory");
+ adios(EX_OSERR, "chdir", "could not change working directory");
return r;
}
char olddir[BUFSIZ];
FILE *f;
if (getcwd(olddir, sizeof(olddir)) == 0)
- adios("getcwd", "could not get working directory");
+ adios(EX_OSERR, "getcwd", "could not get working directory");
if (chdir(dir) != 0)
- adios("chdir", "could not change working directory");
+ adios(EX_OSERR, "chdir", "could not change working directory");
f = popen(cmd, type);
if (chdir(olddir) != 0)
- adios("chdir", "could not change working directory");
+ adios(EX_OSERR, "chdir", "could not change working directory");
return f;
}
static int
-editfile(char **ed, char **arg, char *file, int use)
+editfile(char **ed, char **arg, char *file)
{
int pid, status, vecp;
char *cp, *vec[MAXARGS];
switch (pid = fork()) {
case NOTOK:
advise("fork", "unable to");
- status = NOTOK;
+ status = EX_OSERR;
break;
case OK:
execvp(*ed, vec);
fprintf(stderr, "%s: unable to exec ", invo_name);
perror(*ed);
- _exit(-1);
+ _exit(EX_OSERR);
default:
if ((status = pidwait(pid, NOTOK))) {
if ((status & 0xff00) == 0xff00) {
/* cmd not found or pidwait() failed */
- status = -1;
+ status = EX_SOFTWARE;
break;
}
if (status & 0x00ff) {
}
/* remember which editor we used */
- edsave = getcpy(*ed);
+ edsave = mh_xstrdup(*ed);
*ed = NULL;
execvp(*vec, vec);
fprintf(stderr, "%s: unable to exec ", invo_name);
perror("send");
- _exit(-1);
+ _exit(EX_OSERR);
}
removefile(char *drft)
{
if (unlink(drft) == NOTOK)
- adios(drft, "unable to unlink");
+ adios(EX_IOERR, drft, "unable to unlink");
return OK;
}