projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test if aliasing work in spost
[mmh]
/
uip
/
mhlist.c
diff --git
a/uip/mhlist.c
b/uip/mhlist.c
index
99b2cc7
..
9022ecf
100644
(file)
--- a/
uip/mhlist.c
+++ b/
uip/mhlist.c
@@
-15,31
+15,27
@@
#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[] = {
static struct swit switches[] = {
-#define HEADSW 0
- { "headers", 0 },
-#define NHEADSW 1
- { "noheaders", 0 },
-#define SIZESW 2
- { "realsize", 0 },
-#define NSIZESW 3
- { "norealsize", 0 },
-#define VERBSW 4
+#define VERBSW 0
{ "verbose", 0 },
{ "verbose", 0 },
-#define NVERBSW 5
- { "noverbose", 0 },
-#define FILESW 6 /* interface from show */
+#define NVERBSW 1
+ { "noverbose", 2 },
+#define FILESW 2 /* interface from show */
{ "file file", 0 },
{ "file file", 0 },
-#define PARTSW 7
+#define PARTSW 3
{ "part number", 0 },
{ "part number", 0 },
-#define TYPESW 8
+#define TYPESW 4
{ "type content", 0 },
{ "type content", 0 },
-#define VERSIONSW 9
- { "version", 0 },
-#define HELPSW 10
+#define VERSIONSW 5
+ { "Version", 0 },
+#define HELPSW 6
{ "help", 0 },
{ "help", 0 },
-#define DEBUGSW 11
+#define DEBUGSW 7
{ "debug", -5 },
{ NULL, 0 }
};
{ "debug", -5 },
{ NULL, 0 }
};
@@
-76,12
+72,12
@@
void set_endian(void);
void flush_errors(void);
/* mhlistsbr.c */
void flush_errors(void);
/* mhlistsbr.c */
-void list_all_messages(CT *, int, int, int, int);
+void list_all_messages(CT *, int, int);
/* 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
@@
-92,7
+88,6
@@
static void pipeser(int);
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- int sizesw = 1, headsw = 1;
int msgnum;
char *cp, *file = NULL, *folder = NULL;
char *maildir, buf[100], **argp;
int msgnum;
char *cp, *file = NULL, *folder = NULL;
char *maildir, buf[100], **argp;
@@
-101,11
+96,11
@@
main(int argc, char **argv)
struct msgs *mp = NULL;
CT ct, *ctp;
struct msgs *mp = NULL;
CT ct, *ctp;
- 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]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-122,53
+117,39
@@
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] [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);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done(1);
-
- case HEADSW:
- headsw = 1;
- continue;
- case NHEADSW:
- headsw = 0;
- continue;
-
- case SIZESW:
- sizesw = 1;
- continue;
- case NSIZESW:
- sizesw = 0;
- continue;
+ 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 (!(cp = *argp++) || (*cp == '-' && cp[1]))
types[ntype++] = cp;
continue;
case FILESW:
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;
argp[-2]);
file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
@@
-186,7
+167,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
@@
-210,14
+191,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)))
@@
-233,25
+214,27
@@
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 */
/* 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);
+ for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+ if (!m_convert(mp, msgs.msgs[msgnum])) {
+ exit(EX_SOFTWARE);
+ }
+ }
seq_setprev(mp); /* set the previous-sequence */
seq_setprev(mp); /* set the previous-sequence */
- 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;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
ctp = cts;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@
-266,7
+249,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);
@@
-290,7
+273,7
@@
main(int argc, char **argv)
/*
** List the message content
*/
/*
** List the message content
*/
- list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+ list_all_messages(cts, verbosw, debugsw);
/* Now free all the structures for the content */
for (ctp = cts; *ctp; ctp++)
/* Now free all the structures for the content */
for (ctp = cts; *ctp; ctp++)
@@
-307,8
+290,7
@@
main(int argc, char **argv)
context_save(); /* save the context file */
}
context_save(); /* save the context file */
}
- done(0);
- return 1;
+ return EX_OK;
}
}
@@
-322,6
+304,6
@@
pipeser(int i)
fflush(stderr);
}
fflush(stderr);
}
- done(1);
+ _exit(EX_IOERR);
/* NOTREACHED */
}
/* NOTREACHED */
}