#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
#include <h/utils.h>
#ifdef HAVE_SYS_TIME_H
{ "verbose", 0 },
#define NVERBSW 11
{ "noverbose", 0 },
-#define RCACHESW 12
- { "rcache policy", 0 },
-#define WCACHESW 13
- { "wcache policy", 0 },
-#define CONTENTIDSW 14
+#define CONTENTIDSW 12
{ "contentid", 0 },
-#define NCONTENTIDSW 15
+#define NCONTENTIDSW 13
{ "nocontentid", 0 },
-#define VERSIONSW 16
+#define VERSIONSW 14
{ "version", 0 },
-#define HELPSW 17
+#define HELPSW 15
{ "help", 0 },
-#define DEBUGSW 18
+#define DEBUGSW 16
{ "debug", -5 },
{ NULL, 0 }
};
int make_intermediates(char *);
void content_error(char *, CT, char *, ...);
-/* mhcachesbr.c */
-int find_cache(CT, int, int *, char *, char *, int);
-
-/* ftpsbr.c */
-int ftp_get(char *, char *, char *, char *, char *, char *, int, int);
-
/* mhfree.c */
void free_content(CT);
void free_ctinfo(CT);
static CT build_mime(char *);
-
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
int debugsw = 0;
int verbosw = 0;
main(int argc, char **argv)
{
int sizesw = 1, headsw = 1;
- int *icachesw;
char *cp, buf[BUFSIZ];
char buffer[BUFSIZ], *compfile = NULL;
char **argp, **arguments;
print_version(invo_name);
done(1);
- case RCACHESW:
- icachesw = &rcachesw;
- goto do_cache;
- case WCACHESW:
- icachesw = &wcachesw;
- do_cache: ;
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- switch (*icachesw = smatch(cp, caches)) {
- case AMBIGSW:
- ambigsw(cp, caches);
- done(1);
- case UNKWNSW:
- adios(NULL, "%s unknown", cp);
- default:
- break;
- }
- continue;
-
case EBCDICSW:
ebcdicsw++;
continue;
fclose(fp);
}
- /* Check for public cache location */
- if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
- cache_public = NULL;
-
- /* Check for private cache location */
- if (!(cache_private = context_find(nmhprivcache)))
- cache_private = ".cache";
- cache_private = getcpy(toabsdir(cache_private));
-
/*
** Check for storage directory. If defined, we
** will store temporary files there. Else we
static int
user_content(FILE *in, char *file, char *buf, CT *ctp)
{
- int extrnal, vrsn;
+ int vrsn;
unsigned char *cp;
char **ap;
char buffer[BUFSIZ];
** must be some type of explicit directive.
*/
- /* check if directive is external-type */
- extrnal = (buf[1] == '@');
+ if (buf[1] == '@') {
+ adios(NULL, "The #@ directive i.e. message/external-body "
+ "is not supported anymore.");
+ }
/* parse directive */
- if (get_ctinfo(buf + (extrnal ? 2 : 1), ct, 1) == NOTOK)
+ if (get_ctinfo(buf+1, ct, 1) == NOTOK)
done(1);
/* check directive against the list of MIME types */
** Check if the directive specified a valid type.
** This will happen if it was one of the following forms:
**
- ** #type/subtype (or)
- ** #@type/subtype
+ ** #type/subtype
*/
if (s2i->si_key) {
if (!ci->ci_subtype)
/* NOTREACHED */
case CT_MESSAGE:
- if (!mh_strcasecmp(ci->ci_subtype, "partial"))
+ if (!mh_strcasecmp(ci->ci_subtype, "partial") ||
+ !mh_strcasecmp(ci->ci_subtype,
+ "external-body")) {
adios(NULL, "sorry, \"#%s/%s\" isn't supported", ci->ci_type, ci->ci_subtype);
- if (!mh_strcasecmp(ci->ci_subtype, "external-body"))
- adios(NULL, "use \"#@type/subtype ... [] ...\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
+ }
use_forw:
adios(NULL, "use \"#forw [+folder] [msgs]\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
/* NOTREACHED */
break;
}
- /*
- ** #@type/subtype (external types directive)
- */
- if (extrnal) {
- struct exbody *e;
- CT p;
-
- if (!ci->ci_magic)
- adios(NULL, "need external information for \"#@%s/%s\"", ci->ci_type, ci->ci_subtype);
- p = ct;
-
- snprintf(buffer, sizeof(buffer), "message/external-body; %s", ci->ci_magic);
- free(ci->ci_magic);
- ci->ci_magic = NULL;
-
- /*
- ** Since we are using the current Content structure to
- ** hold information about the type of the external
- ** reference, we need to create another Content
- ** structure for the message/external-body to wrap
- ** it in.
- */
- if ((ct = (CT) calloc(1, sizeof(*ct))) == NULL)
- adios(NULL, "out of memory");
- *ctp = ct;
- ci = &ct->c_ctinfo;
- if (get_ctinfo(buffer, ct, 0) == NOTOK)
- done(1);
- ct->c_type = CT_MESSAGE;
- ct->c_subtype = MESSAGE_EXTERNAL;
-
- if ((e = (struct exbody *)
- calloc(1, sizeof(*e))) == NULL)
- adios(NULL, "out of memory");
- ct->c_ctparams = (void *) e;
-
- e->eb_parent = ct;
- e->eb_content = p;
- p->c_ctexbody = e;
-
- if (params_external(ct, 1) == NOTOK)
- done(1);
-
- return OK;
- }
-
/* Handle [file] argument */
if (ci->ci_magic) {
/* check if specifies command to execute */
return OK;
}
- if (extrnal)
- adios(NULL, "external definition not allowed for \"#%s\"",
- ci->ci_type);
-
/*
** Message directive
** #forw [+folder] [msgs]
checkebcdic = 0;
checklinelen = 0;
checklinespace = 0;
-
- /* don't check anything for message/external */
- if (ct->c_subtype == MESSAGE_EXTERNAL)
- checkboundary = 0;
- else
- checkboundary = 1;
+ checkboundary = 1;
break;
case CT_AUDIO:
static int
build_headers(CT ct)
{
- int cc, mailbody, len;
+ int cc, len;
char **ap, **ep;
char *np, *vp, buffer[BUFSIZ];
CI ci = &ct->c_ctinfo;
len = strlen(TYPE_FIELD) + strlen(ci->ci_type) +
strlen(ci->ci_subtype) + 3;
- mailbody = ct->c_type == CT_MESSAGE &&
- ct->c_subtype == MESSAGE_EXTERNAL &&
- ((struct exbody *) ct->c_ctparams)->eb_body;
-
/*
** Append the attribute/value pairs to
** the end of the Content-Type line.
*/
for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
- if (mailbody && !mh_strcasecmp(*ap, "body"))
- continue;
-
vp = add(";", vp);
len++;
skip_headers:
/*
- ** If this is the internal content structure for a
- ** "message/external", then we are done with the
- ** headers (since it has no body).
- */
- if (ct->c_ctexbody)
- return OK;
-
- /*
** output the Content-Transfer-Encoding
*/
switch (ct->c_encoding) {
}
break;
- case CT_MESSAGE:
- if (ct->c_subtype == MESSAGE_EXTERNAL) {
- struct exbody *e;
-
- e = (struct exbody *) ct->c_ctparams;
- build_headers(e->eb_content);
- }
- break;
-
default:
/* Nothing to do */
break;
projects / mmh / blobdiff