projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhl and mhbuild ignore to long lines
[mmh]
/
uip
/
mhshow.c
diff --git
a/uip/mhshow.c
b/uip/mhshow.c
index
54aa78d
..
2a62777
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
@@
-38,6
+42,7
@@
static struct swit switches[] = {
{ NULL, 0 }
};
{ NULL, 0 }
};
+char *version=VERSION;
/* mhparse.c */
extern char *tmp; /* directory to place temp files */
/* mhparse.c */
extern char *tmp; /* directory to place temp files */
@@
-75,7
+80,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
@@
-98,11
+103,11
@@
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]);
if (mh_strcasecmp(invo_name, "next")==0) {
mode = NEXT;
invo_name = mhbasename(argv[0]);
if (mh_strcasecmp(invo_name, "next")==0) {
mode = NEXT;
@@
-124,54
+129,54
@@
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] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
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:
if (mode != SHOW) {
types[ntype++] = cp;
continue;
case FILESW:
if (mode != SHOW) {
- adios(NULL, "Either call show as `%s' or use -file", invo_name);
+ 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]);
argp[-2]);
- file = *cp == '-' ? cp : getcpy(expanddir(cp));
+ file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
continue;
case FORMSW:
if (!(cp = *argp++) || *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)
argp[-2]);
if (formsw)
- free(formsw);
- formsw = getcpy(etcpath(cp));
+ mh_free0(&formsw);
+ formsw = mh_xstrdup(etcpath(cp));
continue;
case VERBSW:
continue;
case VERBSW:
@@
-187,11
+192,11
@@
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
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else if (mode != SHOW) {
} else if (mode != SHOW) {
- adios(NULL, "Either call show as `%s' or give message arguments", invo_name);
+ adios(EX_USAGE, NULL, "Either call show as `%s' or give message arguments", invo_name);
} else {
app_msgarg(&msgs, cp);
}
} else {
app_msgarg(&msgs, cp);
}
@@
-236,17
+241,16
@@
main(int argc, char **argv)
if ((cp = context_find(nmhstorage)) && *cp)
tmp = concat(cp, "/", invo_name, NULL);
else
if ((cp = context_find(nmhstorage)) && *cp)
tmp = concat(cp, "/", invo_name, NULL);
else
- tmp = getcpy(toabsdir(invo_name));
+ tmp = mh_xstrdup(toabsdir(invo_name));
if (file && msgs.size)
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");
+ cts = mh_xcalloc(2, sizeof(*cts));
ctp = cts;
if ((ct = parse_mime(file)))
ctp = cts;
if ((ct = parse_mime(file)))
@@
-273,20
+277,20
@@
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]))
- 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,
@@
-297,12
+301,7
@@
main(int argc, char **argv)
if (is_selected(mp, msgnum))
set_unseen(mp, msgnum);
if (is_selected(mp, msgnum))
set_unseen(mp, msgnum);
- 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),
- sizeof(*cts))))
- adios(NULL, "out of memory");
+ cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
ctp = cts;
/*
ctp = cts;
/*
@@
-320,7
+319,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);
@@
-358,19
+357,19
@@
main(int argc, char **argv)
for (ctp = cts; *ctp; ctp++)
free_content(*ctp);
for (ctp = cts; *ctp; ctp++)
free_content(*ctp);
- free((char *) cts);
- cts = NULL;
+ mh_free0(&cts);
/* If reading from a folder, do some updating */
if (mp) {
/* If reading from a folder, do some updating */
if (mp) {
+ seq_read(mp);
+ seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */
context_replace(curfolder, folder); /* update current folder */
seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
}
context_replace(curfolder, folder); /* update current folder */
seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
}
- done(0);
- return 1;
+ return 0;
}
}
@@
-384,7
+383,7
@@
pipeser(int i)
fflush(stderr);
}
fflush(stderr);
}
- done(1);
+ _exit(EX_IOERR);
/* NOTREACHED */
}
/* NOTREACHED */
}
@@
-399,14
+398,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);
@@
-420,7
+419,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]);
@@
-441,7
+440,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);