OPTIMAPPASSIVE,
OPTIMAPPEEK,
OPTIMAPSERVERNOISE,
-# if defined(USE_SSL) || defined(USE_GNUTLS)
- OPTIMAPFORCESSL,
-# endif
#endif
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
# ifndef USE_GNUTLS
+ OPTSSLSYSTEMCERTS,
OPTSSLV2,
-# endif
+# endif /* !USE_GNUTLS */
OPTSSLV3,
OPTTLSV1,
-# ifndef USE_GNUTLS
- OPTSSLSYSTEMCERTS,
-# endif
-#endif
+ OPTSSLFORCETLS,
+#endif /* USE_SSL || USE_GNUTLS */
OPTIMPLICITAUTOVIEW,
OPTINCLUDEONLYFIRST,
OPTKEEPFLAGGED,
#define toggle_option(x) mutt_bit_toggle(Options,x)
#define option(x) mutt_bit_isset(Options,x)
-/* Exit values used in send_msg() */
-#define S_ERR 127
-#define S_BKG 126
-
typedef struct list_t {
char *data;
struct list_t *next;
} SPAM_LIST;
-#define mutt_new_list() safe_calloc (1, sizeof (LIST))
-#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
+#define mutt_new_list() mem_calloc (1, sizeof (LIST))
+#define mutt_new_spam_list() mem_calloc (1, sizeof (SPAM_LIST))
void mutt_free_list (LIST **);
void mutt_free_spam_list (SPAM_LIST **);
LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
/* add an element to a list */
-LIST *mutt_add_list (LIST *, const char *);
+LIST *mutt_add_list (LIST*, const char*);
+LIST *mutt_add_list_n (LIST*, const void*, size_t len);
void mutt_init (int, LIST *);
-typedef struct alias {
- struct alias *self; /* XXX - ugly hack */
- char *name;
- ADDRESS *addr;
- struct alias *next;
- short tagged;
- short del;
- short num;
-} ALIAS;
-
typedef struct envelope {
ADDRESS *return_path;
ADDRESS *from;
unsigned int counting:1; /* do we just want to cound? */
} CONTEXT;
-typedef struct attachptr {
- BODY *content;
- int parent_type;
- char *tree;
- int level;
- int num;
-} ATTACHPTR;
-
-typedef struct {
- FILE *fpin;
- FILE *fpout;
- char *prefix;
- int flags;
-} STATE;
-
-/* used by enter.c */
-
-typedef struct {
- wchar_t *wbuf;
- size_t wbuflen;
- size_t lastchar;
- size_t curpos;
- size_t begin;
- int tabs;
-} ENTER_STATE;
-
-/* flags for the STATE struct */
-#define M_DISPLAY (1<<0) /* output is displayed to the user */
-#define M_VERIFY (1<<1) /* perform signature verification */
-#define M_PENDINGPREFIX (1<<2) /* prefix to write, but character must follow */
-#define M_WEED (1<<3) /* weed headers even when not in display mode */
-#define M_CHARCONV (1<<4) /* Do character set conversions */
-#define M_PRINTING (1<<5) /* are we printing? - M_DISPLAY "light" */
-#define M_REPLYING (1<<6) /* are we replying? */
-#define M_FIRSTDONE (1<<7) /* the first attachment has been done */
-
-#define state_set_prefix(s) ((s)->flags |= M_PENDINGPREFIX)
-#define state_reset_prefix(s) ((s)->flags &= ~M_PENDINGPREFIX)
-#define state_puts(x,y) fputs(x,(y)->fpout)
-#define state_putc(x,y) fputc(x,(y)->fpout)
-
-void state_mark_attach (STATE *);
-void state_attach_puts (const char *, STATE *);
-void state_prefix_putc (char, STATE *);
-int state_printf (STATE *, const char *, ...);
-
#include "ascii.h"
+#include "alias.h"
+#include "buffer.h"
+#include "state.h"
+#include "enter.h"
#include "protos.h"
#include "lib.h"
#include "globals.h"