#include <fcntl.h>
#include <h/signals.h>
#include <errno.h>
-#include <setjmp.h>
#include <signal.h>
#include <h/tws.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 AUTOSW 0
{ "auto", 0 },
#define NAUTOSW 1
- { "noauto", 0 },
+ { "noauto", 2 },
#define FILESW 2 /* interface from show */
{ "file file", 0 },
#define PARTSW 3
#define TYPESW 4
{ "type content", 0 },
#define VERSIONSW 5
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 6
{ "help", 0 },
#define DEBUGSW 7
/* mhfree.c */
void free_content(CT);
extern CT *cts; /* The list of top-level contents to display */
-void freects_done(int) NORETURN;
+void freects_done();
/*
** static prototypes
CT ct, *ctp;
FILE *fp;
- done=freects_done;
+ if (atexit(freects_done) != 0) {
+ adios(EX_OSERR, NULL, "atexit failed");
+ }
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(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 [+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);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case AUTOSW:
autosw++;
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)
- 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 == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
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]))
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
}
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
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) {
- if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
- adios(NULL, "out of memory");
+ cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts));
ctp = cts;
if ((ct = parse_mime(file)))
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)))
- 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)
- 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]))
- done(1);
+ exit(EX_USAGE);
seq_setprev(mp); /* set the previous-sequence */
- if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
- sizeof(*cts))))
- adios(NULL, "out of memory");
+ cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
+ sizeof(*cts));
ctp = cts;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
}
if (!*cts)
- done(1);
+ exit(EX_SOFTWARE);
userrs = 1;
SIGNAL(SIGQUIT, quitser);
context_save(); /* save the context file */
}
- done(0);
- return 1;
+ return 0;
}
fflush(stdout);
fprintf(stderr, "\n");
fflush(stderr);
+ exit(EX_TEMPFAIL);
}
- done(1);
+ exit(EX_IOERR);
/* NOTREACHED */
}
break;
default:
- adios(NULL, "unknown content type %d", ct->c_type);
+ adios(EX_DATAERR, NULL, "unknown content type %d", ct->c_type);
break;
}
** Generic routine to store a MIME content.
** (application, audio, video, image, text, message/rfc922)
*/
-
static int
store_generic(CT ct)
{
** Check if the content specifies a filename in its MIME parameters.
** Don't bother with this for type "message"
** (only the "message" subtype "rfc822" will use store_generic).
- ** The storeproc may already be defined, if this content
- ** is part of a "message/external", for instance.
*/
- if (autosw && ct->c_type != CT_MESSAGE && !ct->c_storeproc) {
+ if (autosw && ct->c_type != CT_MESSAGE) {
/*
** Check the attribute/value pairs, for the attribute "name".
** If found, take the basename, do a few sanity checks and
return NOTOK;
}
- if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL)
- adios(NULL, "out of memory");
+ base = (CT *) mh_xcalloc((size_t) (i + 1), sizeof(*base));
ctq = base;
for (ctp = cts; *ctp; ctp++) {
/*
-** Store content from a message of type "message/external".
+** Show how to retrieve content of type "message/external".
*/
-
static int
store_external(CT ct)
{
- int result = NOTOK;
- struct exbody *e = (struct exbody *) ct->c_ctparams;
- CT p = e->eb_content;
-
- if (!type_ok(p, 1))
- return OK;
+ char **ap, **ep;
+ char *msg;
+ FILE *fp;
+ char buf[BUFSIZ];
- /*
- ** Check if the parameters for the external body
- ** specified a filename.
- */
- if (autosw) {
- char *cp;
-
- cp = mhbasename(e->eb_name);
- if (*cp && *cp!='.' && *cp!='|' && *cp!='!' &&
- !strchr(cp, '%')) {
- /* filename looks good: use it */
- if (!ct->c_storeproc)
- ct->c_storeproc = getcpy(cp);
- if (!p->c_storeproc)
- p->c_storeproc = getcpy(cp);
+ msg = add("You need to fetch the contents yourself:", NULL);
+ ap = ct->c_ctinfo.ci_attrs;
+ ep = ct->c_ctinfo.ci_values;
+ for (; *ap; ap++, ep++) {
+ msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg);
+ }
+ if (!(fp = fopen(ct->c_file, "r"))) {
+ adios(EX_IOERR, ct->c_file, "unable to open");
+ }
+ fseek(fp, ct->c_begin, SEEK_SET);
+ while (!feof(fp) && ftell(fp) < ct->c_end) {
+ if (!fgets(buf, sizeof buf, fp)) {
+ adios(EX_IOERR, ct->c_file, "unable to read");
}
+ *strchr(buf, '\n') = '\0';
+ msg = add(concat("\n\t", buf, NULL), msg);
}
-
- /*
- ** Since we will let the Content structure for the
- ** external body substitute for the current content,
- ** we temporarily change its partno (number inside
- ** multipart), so everything looks right.
- */
- p->c_partno = ct->c_partno;
-
- /* we probably need to check if content is really there */
- result = store_switch(p);
-
- p->c_partno = NULL;
- return result;
+ fclose(fp);
+ advise(NULL, msg);
+ return OK;
}
** 4) Else if content is "message", use "+" (current folder)
** 5) Else use string "%m%P.%s".
*/
- if ((cp = ct->c_storeproc) == NULL || *cp == '\0') {
+ if (!(cp = ct->c_storeproc) || !*cp) {
CI ci = &ct->c_ctinfo;
snprintf(buffer, sizeof(buffer), "%s-store-%s/%s",
projects / mmh / blobdiff