X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuild.c;h=5cccd2a78fd63b59392dde2b0f951fe97efdeeb7;hp=e6caba39888aafa55def634e1e8dc35e71a59eef;hb=01a3480928da485b4d6109d36d751dfa71799d58;hpb=31dc797eb5178970d68962ca8939da3fd9a8efda

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index e6caba3..5cccd2a 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -21,7 +21,6 @@
 #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
@@ -30,43 +29,31 @@
 #include <time.h>
 
 static struct swit switches[] = {
-#define EBCDICSW  0
-	{ "ebcdicsafe", 0 },
-#define NEBCDICSW  1
-	{ "noebcdicsafe", 0 },
-#define HEADSW  2
+#define HEADSW  0
 	{ "headers", 0 },
-#define NHEADSW  3
+#define NHEADSW  1
 	{ "noheaders", 0 },
-#define LISTSW  4
+#define LISTSW  2
 	{ "list", 0 },
-#define NLISTSW  5
+#define NLISTSW  3
 	{ "nolist", 0 },
-#define SIZESW  6
-	{ "realsize", 0 },
-#define NSIZESW  7
-	{ "norealsize", 0 },
-#define RFC934SW  8
+#define RFC934SW  4
 	{ "rfc934mode", 0 },
-#define NRFC934SW  9
+#define NRFC934SW  5
 	{ "norfc934mode", 0 },
-#define VERBSW  10
+#define VERBSW  6
 	{ "verbose", 0 },
-#define NVERBSW  11
+#define NVERBSW  7
 	{ "noverbose", 0 },
-#define RCACHESW  12
-	{ "rcache policy", 0 },
-#define WCACHESW  13
-	{ "wcache policy", 0 },
-#define CONTENTIDSW  14
+#define CONTENTIDSW  8
 	{ "contentid", 0 },
-#define NCONTENTIDSW  15
+#define NCONTENTIDSW  9
 	{ "nocontentid", 0 },
-#define VERSIONSW  16
+#define VERSIONSW  10
 	{ "version", 0 },
-#define HELPSW  17
+#define HELPSW  11
 	{ "help", 0 },
-#define DEBUGSW  18
+#define DEBUGSW  12
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -91,12 +78,6 @@ static char prefix[] = "----- =_aaaaaaaaaa";
 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);
@@ -115,17 +96,9 @@ static int build_headers(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;
 
-int ebcdicsw = 0;
 int listsw   = 0;
 int rfc934sw = 0;
 int contentidsw = 1;
@@ -146,7 +119,7 @@ int output_message(CT, char *);
 int output_message_fp(CT, FILE *, char*);
 
 /* mhlistsbr.c */
-int list_all_messages(CT *, int, int, int, int);
+int list_all_messages(CT *, int, int, int);
 
 /* mhmisc.c */
 void set_endian(void);
@@ -158,8 +131,7 @@ void free_content(CT);
 int
 main(int argc, char **argv)
 {
-	int sizesw = 1, headsw = 1;
-	int *icachesw;
+	int headsw = 1;
 	char *cp, buf[BUFSIZ];
 	char buffer[BUFSIZ], *compfile = NULL;
 	char **argp, **arguments;
@@ -206,33 +178,6 @@ main(int argc, char **argv)
 				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;
-			case NEBCDICSW:
-				ebcdicsw = 0;
-				continue;
-
 			case HEADSW:
 				headsw++;
 				continue;
@@ -254,13 +199,6 @@ main(int argc, char **argv)
 				rfc934sw = 0;
 				continue;
 
-			case SIZESW:
-				sizesw++;
-				continue;
-			case NSIZESW:
-				sizesw = 0;
-				continue;
-
 			case CONTENTIDSW:
 				contentidsw = 1;
 				continue;
@@ -311,15 +249,6 @@ main(int argc, char **argv)
 		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
@@ -400,7 +329,7 @@ main(int argc, char **argv)
 	** List the message info
 	*/
 	if (listsw)
-		list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+		list_all_messages(cts, headsw, verbosw, debugsw);
 
 	/* Rename composition draft */
 	snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));
@@ -709,7 +638,7 @@ fgetstr(char *s, int n, FILE *stream)
 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];
@@ -890,11 +819,13 @@ call_init:
 	** 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 */
@@ -906,8 +837,7 @@ call_init:
 	** 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)
@@ -919,10 +849,11 @@ call_init:
 			/* 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 */
@@ -933,52 +864,6 @@ use_forw:
 			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 */
@@ -1021,10 +906,6 @@ use_forw:
 		return OK;
 	}
 
-	if (extrnal)
-		adios(NULL, "external definition not allowed for \"#%s\"",
-				ci->ci_type);
-
 	/*
 	** Message directive
 	** #forw [+folder] [msgs]
@@ -1237,42 +1118,6 @@ set_id(CT ct, int top)
 }
 
 
-static char ebcdicsafe[0x100] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-
 /*
 ** Fill out, or expand the various contents in the composition
 ** draft.  Read-in any necessary files.  Parse and execute any
@@ -1519,7 +1364,6 @@ scan_content(CT ct)
 	int checklinelen = 0, linelen = 0;  /* check for long lines */
 	int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
 	int checklinespace = 0, linespace = 0;  /* check if any line ends with space */
-	int checkebcdic = 0, ebcdicunsafe = 0;  /* check if contains ebcdic unsafe characters */
 	unsigned char *cp = NULL, buffer[BUFSIZ];
 	struct text *t = NULL;
 	FILE *in = NULL;
@@ -1566,11 +1410,9 @@ scan_content(CT ct)
 		check8bit = 1;
 		checkboundary = 1;
 		if (ct->c_subtype == TEXT_PLAIN) {
-			checkebcdic = 0;
 			checklinelen = 0;
 			checklinespace = 0;
 		} else {
-			checkebcdic = ebcdicsw;
 			checklinelen = 1;
 			checklinespace = 1;
 		}
@@ -1578,7 +1420,6 @@ scan_content(CT ct)
 
 	case CT_APPLICATION:
 		check8bit = 1;
-		checkebcdic = ebcdicsw;
 		checklinelen = 1;
 		checklinespace = 1;
 		checkboundary = 1;
@@ -1586,15 +1427,9 @@ scan_content(CT ct)
 
 	case CT_MESSAGE:
 		check8bit = 0;
-		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:
@@ -1605,7 +1440,6 @@ scan_content(CT ct)
 		** since we are forcing use of base64.
 		*/
 		check8bit = 0;
-		checkebcdic = 0;
 		checklinelen = 0;
 		checklinespace = 0;
 		checkboundary = 0;
@@ -1631,16 +1465,6 @@ scan_content(CT ct)
 						/* no need to keep checking */
 						check8bit = 0;
 					}
-					/*
-					** Check if character is ebcdic-safe.
-					** We only check this if also checking
-					** for 8bit data.
-					*/
-					if (checkebcdic && !ebcdicsafe[*cp & 0xff]) {
-						ebcdicunsafe = 1;
-						/* no need to keep checking */
-						checkebcdic = 0;
-					}
 				}
 			}
 
@@ -1717,7 +1541,7 @@ scan_content(CT ct)
 			*ep = cp;
 		}
 
-		if (contains8bit || ebcdicunsafe || linelen || linespace)
+		if (contains8bit || linelen || linespace)
 			ct->c_encoding = CE_QUOTED;
 		else
 			ct->c_encoding = CE_7BIT;
@@ -1725,7 +1549,7 @@ scan_content(CT ct)
 
 	case CT_APPLICATION:
 		/* For application type, use base64, except when postscript */
-		if (contains8bit || ebcdicunsafe || linelen || linespace)
+		if (contains8bit || linelen || linespace)
 			ct->c_encoding = (ct->c_subtype ==
 					APPLICATION_POSTSCRIPT) ?
 					CE_QUOTED : CE_BASE64;
@@ -1758,7 +1582,7 @@ scan_content(CT ct)
 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;
@@ -1801,18 +1625,11 @@ build_headers(CT ct)
 	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++;
 
@@ -1876,14 +1693,6 @@ build_headers(CT ct)
 
 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) {
@@ -1951,15 +1760,6 @@ skip_headers:
 	}
 		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;