X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmhparse.h;h=1ff37bf39da9e0c818ba99432b54ab9a47506c1d;hp=af9b8caac7fa6949c057ecd3228a1412b6ee2fff;hb=ee8d01d64e8832304256de53db07228e2be67f6a;hpb=31dc797eb5178970d68962ca8939da3fd9a8efda

diff --git a/h/mhparse.h b/h/mhparse.h
index af9b8ca..1ff37bf 100644
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -91,9 +91,11 @@ struct Content {
 	char *c_partno;              /* within multipart content          */
 
 	/* Content-Type info */
+	boolean crlf;                /* are the line ending CRLF          */
 	struct CTinfo c_ctinfo;      /* parsed elements of Content-Type   */
 	int c_type;                  /* internal flag for content type    */
 	int c_subtype;               /* internal flag for content subtype */
+	char *c_charset;             /* charset string                    */
 
 	/* Content-Transfer-Encoding info (decoded contents) */
 	CE c_cefile;                 /* structure holding decoded content */
@@ -101,7 +103,6 @@ struct Content {
 
 	/* pointers to content-specific structures */
 	void *c_ctparams;            /* content type specific data        */
-	struct exbody *c_ctexbody;   /* data for type message/external    */
 
 	/* function pointers */
 	InitFunc    c_ctinitfnx;     /* parse content body                */
@@ -110,11 +111,8 @@ struct Content {
 	SizeCEFunc  c_cesizefnx;     /* size of decoded contents          */
 
 	int c_umask;                 /* associated umask                  */
-	pid_t c_pid;                 /* process doing display             */
-	int c_rfc934;                /* rfc934 compatibility flag         */
 
 	char *c_showproc;            /* default, if not in profile        */
-	char *c_termproc;            /* for charset madness...            */
 	char *c_storeproc;           /* overrides profile entry, if any   */
 
 	char *c_storage;             /* write contents (file)             */
@@ -210,24 +208,6 @@ struct partial {
 	int pm_stored;
 };
 
-/* Structure for message/external */
-struct exbody {
-	CT eb_parent;        /* pointer to controlling content structure */
-	CT eb_content;       /* pointer to internal content structure    */
-	char *eb_partno;
-	char *eb_access;
-	int eb_flags;
-	char *eb_name;
-	char *eb_permission;
-	char *eb_site;
-	char *eb_dir;
-	char *eb_mode;
-	unsigned long eb_size;
-	char *eb_server;
-	char *eb_subject;
-	char *eb_body;
-};
-
 /*
 ** APPLICATION content
 */
@@ -262,7 +242,6 @@ struct str2init {
 };
 extern struct str2init str2cts[];
 extern struct str2init str2ces[];
-extern struct str2init str2methods[];
 
 /*
 ** prototypes
@@ -271,6 +250,6 @@ int pidcheck(int);
 CT parse_mime(char *);
 int add_header(CT, char *, char *);
 int get_ctinfo(unsigned char *, CT, int);
-int params_external(CT, int);
 int open7Bit(CT, char **);
 void close_encoding(CT);
+char *extract_name_value(char *, char *);