CVS branch clean-up.

1 files changed, 73 insertions, 49 deletions

diff --git a/mutt.h b/mutt.h
index 4620764d..2b7bc5f6 100644
--- a/mutt.h
+++ b/mutt.h
@@ -20,10 +20,15 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <limits.h>
 #include <stdarg.h>
 
+#ifndef _POSIX_PATH_MAX
+#include <posix1_lim.h>
+#endif
+
 #include "rfc822.h"
 #include "hash.h"
 
@@ -93,7 +98,8 @@ typedef enum
   M_FORMAT_FORCESUBJ	= (1<<0), /* print the subject even if unchanged */
   M_FORMAT_TREE		= (1<<1), /* draw the thread tree */
   M_FORMAT_MAKEPRINT	= (1<<2), /* make sure that all chars are printable */
-  M_FORMAT_OPTIONAL	= (1<<3)
+  M_FORMAT_OPTIONAL	= (1<<3),
+  M_FORMAT_STAT_FILE	= (1<<4)  /* used by mutt_attach_fmt */
 } format_flag;
 
 /* types for mutt_add_hook() */
@@ -102,6 +108,7 @@ typedef enum
 #define M_SENDHOOK	(1<<2)
 #define M_FCCHOOK	(1<<3)
 #define M_SAVEHOOK	(1<<4)
+#define M_PGPHOOK	(1<<5)
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER		1
@@ -170,6 +177,9 @@ enum
   M_PRINT,
   M_AUTOVIEW,
 
+  /* options for socket code */
+  M_NEW_SOCKET,
+
   /* Options for mutt_save_attachment */
   M_SAVE_APPEND
 };
@@ -219,23 +229,67 @@ enum
 /* boolean vars */
 enum
 {
-  OPTPROMPTAFTER,
-  OPTSTATUSONTOP,
   OPTALLOW8BIT,
-  OPTASCIICHARS,
-  OPTMETOO,
-  OPTEDITHDRS,
   OPTARROWCURSOR,
+  OPTASCIICHARS,
+  OPTASKBCC,
   OPTASKCC,
+  OPTATTACHSPLIT,
+  OPTAUTOEDIT,
+  OPTAUTOTAG,
+  OPTBEEP,
+  OPTBEEPNEW,
+  OPTCHECKNEW,
+  OPTCONFIRMAPPEND,
+  OPTCONFIRMCREATE,
+  OPTEDITHDRS,
+  OPTFASTREPLY,
+  OPTFCCATTACH,
+  OPTFOLLOWUPTO,
+  OPTFORCENAME,
+  OPTFORWDECODE,
+  OPTFORWQUOTE,
+  OPTHDRS,
   OPTHEADER,
+  OPTHELP,
+  OPTHIDDENHOST,
+  OPTIGNORELISTREPLYTO,
+  OPTMARKERS,
+  OPTMARKOLD,
+  OPTMENUSCROLL,	/* scroll menu instead of implicit next-page */
+  OPTMETAKEY,		/* interpret ALT-x as ESC-x */
+  OPTMETOO,
+  OPTMIMEFORWDECODE,
+  OPTPAGERSTOP,
+  OPTPIPEDECODE,
+  OPTPIPESPLIT,
+  OPTPOPDELETE,
+  OPTPROMPTAFTER,
+  OPTREADONLY,
+  OPTRESOLVE,
   OPTREVALIAS,
   OPTREVNAME,
-  OPTFORCENAME,
+  OPTSAVEADDRESS,
   OPTSAVEEMPTY,
-  OPTPAGERSTOP,
+  OPTSAVENAME,
   OPTSIGDASHES,
-  OPTASKBCC,
-  OPTAUTOEDIT,
+  OPTSORTRE,
+  OPTSTATUSONTOP,
+  OPTSTRICTTHREADS,
+  OPTSUSPEND,
+  OPTTHOROUGHSRC,
+  OPTTILDE,
+  OPTUSE8BITMIME,
+  OPTUSEDOMAIN,
+  OPTUSEFROM,
+  OPTWAITKEY,
+  OPTWEED,
+  OPTWRAP,
+  OPTWRAPSEARCH,
+  OPTWRITEBCC,		/* write out a bcc header? */
+  
+  /* PGP options */
+  
 #ifdef _PGPPATH
   OPTPGPAUTOSIGN,
   OPTPGPAUTOENCRYPT,
@@ -245,44 +299,9 @@ enum
   OPTPGPENCRYPTSELF,
   OPTPGPSTRICTENC,
 #endif
-  OPTMARKOLD,
-  OPTCONFIRMCREATE,
-  OPTCONFIRMAPPEND,
-  OPTPOPDELETE,
-  OPTSAVENAME,
-  OPTTHOROUGHSRC,
-  OPTTILDE,
-  OPTMARKERS,
-  OPTFCCATTACH,
-  OPTPIPESPLIT,
-  OPTPIPEDECODE,
-  OPTREADONLY,
-  OPTRESOLVE,
-  OPTSTRICTTHREADS,
-  OPTAUTOTAG,
-  OPTBEEP,
-  OPTHELP,
-  OPTHDRS,
-  OPTWEED,
-  OPTWRAP,
-  OPTCHECKNEW,
-  OPTFASTREPLY,
-  OPTWAITKEY,
-  OPTWRAPSEARCH,
-  OPTIGNORELISTREPLYTO,
-  OPTSAVEADDRESS,
-  OPTSUSPEND,
-  OPTSORTRE,
-  OPTUSEDOMAIN,
-  OPTUSEFROM,
-  OPTUSE8BITMIME,
-  OPTFORWDECODE,
-  OPTMIMEFORWDECODE,
-  OPTFORWQUOTE,
-  OPTBEEPNEW,
-  OPTFOLLOWUPTO,
-  OPTMENUSCROLL,	/* scroll menu instead of implicit next-page */
-  OPTMETAKEY,		/* interpret ALT-x as ESC-x */
+
+  /* pseudo options */
+
   OPTAUXSORT,		/* (pseudo) using auxillary sort function */
   OPTFORCEREFRESH,	/* (pseudo) refresh even during macros */
   OPTLOCALES,		/* (pseudo) set if user has valid locale definition */
@@ -392,6 +411,7 @@ typedef struct content
 
 typedef struct body
 {
+  char *xtype;			/* content-type if x-unknown */
   char *subtype;                /* content-type subtype */
   PARAMETER *parameter;         /* parameters of the content-type */
   char *description;            /* content-description */
@@ -420,6 +440,10 @@ typedef struct body
   struct body *parts;           /* parts of a multipart or message/rfc822 */
   struct header *hdr;		/* header information for message/rfc822 */
 
+  time_t stamp;			/* time stamp of last
+				 * encoding update.
+				 */
+  
   unsigned int type : 3;        /* content-type primary type */
   unsigned int encoding : 3;    /* content-transfer-encoding */
   unsigned int disposition : 2; /* content-disposition */
@@ -546,7 +570,6 @@ typedef struct
   int msgnotreadyet;		/* which msg "new" in pager, -1 if none */
 #ifdef USE_IMAP
   void *data;			/* driver specific data */
-  int fd;
 #endif /* USE_IMAP */
 
   short magic;			/* mailbox type */
@@ -566,6 +589,7 @@ typedef struct attachptr
   BODY *content;
   char *tree;
   int level;
+  int num;
 } ATTACHPTR;
 
 typedef struct