projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure $SHELL is set for the tests
[mmh]
/
uip
/
mhshow.c
diff --git
a/uip/mhshow.c
b/uip/mhshow.c
index
c323867
..
f48fa99
100644
(file)
--- a/
uip/mhshow.c
+++ b/
uip/mhshow.c
@@
-15,12
+15,16
@@
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/utils.h>
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
static struct swit switches[] = {
#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
- { "noverbose", 0 },
+ { "noverbose", 2 },
#define FILESW 2 /* interface from show */
{ "file file", 0 },
#define FORMSW 3
#define FILESW 2 /* interface from show */
{ "file file", 0 },
#define FORMSW 3
@@
-30,7
+34,7
@@
static struct swit switches[] = {
#define TYPESW 5
{ "type content", 0 },
#define VERSIONSW 6
#define TYPESW 5
{ "type content", 0 },
#define VERSIONSW 6
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 7
{ "help", 0 },
#define DEBUGSW 8
#define HELPSW 7
{ "help", 0 },
#define DEBUGSW 8
@@
-53,6
+57,8
@@
extern char *parts[NPARTS + 1];
extern char *types[NTYPES + 1];
extern int userrs;
extern char *types[NTYPES + 1];
extern int userrs;
+static enum { SHOW, NEXT, PREV } mode = SHOW;
+
int debugsw = 0;
int verbosw = 0;
int debugsw = 0;
int verbosw = 0;
@@
-73,7
+79,7
@@
void show_all_messages(CT *);
/* mhfree.c */
void free_content(CT);
extern CT *cts;
/* mhfree.c */
void free_content(CT);
extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
/*
** static prototypes
/*
** static prototypes
@@
-96,12
+102,17
@@
main(int argc, char **argv)
FILE *fp;
int ontty = 0;
FILE *fp;
int ontty = 0;
- done=freects_done;
+ if (atexit(freects_done) != 0) {
+ adios(EX_OSERR, NULL, "atexit failed");
+ }
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
invo_name = mhbasename(argv[0]);
+ if (mh_strcasecmp(invo_name, "next")==0) {
+ mode = NEXT;
+ } else if (mh_strcasecmp(invo_name, "prev")==0) {
+ mode = PREV;
+ }
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
@@
-117,46
+128,50
@@
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:
case HELPSW:
- snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+ snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
print_help(buf, switches, 1);
print_help(buf, switches, 1);
- done(1);
+ 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 PARTSW:
if (!(cp = *argp++) || *cp == '-')
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if (npart >= NPARTS)
argp[-2]);
if (npart >= NPARTS)
- adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
+ adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
parts[npart++] = cp;
continue;
case TYPESW:
if (!(cp = *argp++) || *cp == '-')
parts[npart++] = cp;
continue;
case TYPESW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if (ntype >= NTYPES)
argp[-2]);
if (ntype >= NTYPES)
- adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
+ adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES);
types[ntype++] = cp;
continue;
case FILESW:
types[ntype++] = cp;
continue;
case FILESW:
+ if (mode != SHOW) {
+ adios(EX_USAGE, NULL, "Either call show as `%s' or use -file", invo_name);
+ }
+
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case FORMSW:
if (!(cp = *argp++) || *cp == '-')
argp[-2]);
file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case FORMSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if (formsw)
free(formsw);
argp[-2]);
if (formsw)
free(formsw);
@@
-176,11
+191,14
@@
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
folder = getcpy(expandfol(cp));
- } else
+ } else if (mode != SHOW) {
+ adios(EX_USAGE, NULL, "Either call show as `%s' or give message arguments", invo_name);
+ } else {
app_msgarg(&msgs, cp);
app_msgarg(&msgs, cp);
+ }
}
/* null terminate the list of acceptable parts/types */
}
/* null terminate the list of acceptable parts/types */
@@
-225,14
+243,14
@@
main(int argc, char **argv)
tmp = getcpy(toabsdir(invo_name));
if (file && msgs.size)
tmp = getcpy(toabsdir(invo_name));
if (file && msgs.size)
- adios(NULL, "cannot specify msg and file at same time!");
+ adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
/*
** check if message is coming from file
*/
if (file) {
/*
** check if message is coming from file
*/
if (file) {
- if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
- adios(NULL, "out of memory");
+ if (!(cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts))))
+ adios(EX_OSERR, NULL, "out of memory");
ctp = cts;
if ((ct = parse_mime(file)))
ctp = cts;
if ((ct = parse_mime(file)))
@@
-241,27
+259,38
@@
main(int argc, char **argv)
/*
** message(s) are coming from a folder
*/
/*
** message(s) are coming from a folder
*/
- if (!msgs.size)
- app_msgarg(&msgs, seq_cur);
+ if (!msgs.size) {
+ switch (mode) {
+ case NEXT:
+ app_msgarg(&msgs, seq_next);
+ break;
+ case PREV:
+ app_msgarg(&msgs, seq_prev);
+ break;
+ default:
+ app_msgarg(&msgs, seq_cur);
+ break;
+ }
+ }
if (!folder)
folder = getcurfol();
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
if (!folder)
folder = getcurfol();
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]))
- done(1);
+ exit(EX_USAGE);
/*
** Set the SELECT_UNSEEN bit for all the SELECTED messages,
/*
** Set the SELECT_UNSEEN bit for all the SELECTED messages,
@@
-275,9
+304,9
@@
main(int argc, char **argv)
seq_setprev(mp); /* set the Previous-Sequence */
seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */
seq_setprev(mp); /* set the Previous-Sequence */
seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */
- if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
+ if (!(cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
sizeof(*cts))))
sizeof(*cts))))
- adios(NULL, "out of memory");
+ adios(EX_OSERR, NULL, "out of memory");
ctp = cts;
/*
ctp = cts;
/*
@@
-295,7
+324,7
@@
main(int argc, char **argv)
}
if (!*cts)
}
if (!*cts)
- done(1);
+ exit(EX_SOFTWARE);
userrs = 1;
SIGNAL(SIGQUIT, quitser);
userrs = 1;
SIGNAL(SIGQUIT, quitser);
@@
-344,8
+373,7
@@
main(int argc, char **argv)
context_save(); /* save the context file */
}
context_save(); /* save the context file */
}
- done(0);
- return 1;
+ return 0;
}
}
@@
-359,7
+387,7
@@
pipeser(int i)
fflush(stderr);
}
fflush(stderr);
}
- done(1);
+ _exit(EX_IOERR);
/* NOTREACHED */
}
/* NOTREACHED */
}
@@
-374,14
+402,14
@@
m_popen(char *name)
int pd[2];
if ((sd = dup(fileno(stdout))) == NOTOK)
int pd[2];
if ((sd = dup(fileno(stdout))) == NOTOK)
- adios("standard output", "unable to dup()");
+ adios(EX_OSERR, "standard output", "unable to dup()");
if (pipe(pd) == NOTOK)
if (pipe(pd) == NOTOK)
- adios("pipe", "unable to");
+ adios(EX_OSERR, "pipe", "unable to");
switch (m_pid = fork()) {
case NOTOK:
switch (m_pid = fork()) {
case NOTOK:
- adios("fork", "unable to");
+ adios(EX_OSERR, "fork", "unable to");
case OK:
SIGNAL(SIGINT, SIG_DFL);
case OK:
SIGNAL(SIGINT, SIG_DFL);
@@
-395,7
+423,7
@@
m_popen(char *name)
execlp(name, mhbasename(name), NULL);
fprintf(stderr, "unable to exec ");
perror(name);
execlp(name, mhbasename(name), NULL);
fprintf(stderr, "unable to exec ");
perror(name);
- _exit(-1);
+ _exit(EX_OSERR);
default:
close(pd[0]);
default:
close(pd[0]);
@@
-416,7
+444,7
@@
m_pclose(void)
if (sd != NOTOK) {
fflush(stdout);
if (dup2(sd, fileno(stdout)) == NOTOK)
if (sd != NOTOK) {
fflush(stdout);
if (dup2(sd, fileno(stdout)) == NOTOK)
- adios("standard output", "unable to dup2()");
+ adios(EX_OSERR, "standard output", "unable to dup2()");
clearerr(stdout);
close(sd);
clearerr(stdout);
close(sd);