#ifndef _MUTT_H
#define _MUTT_H
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* needed for SEEK_SET */
-#endif
-#ifdef HAVE_UNIX_H
-# include <unix.h> /* needed for snprintf on QNX. */
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <signal.h>
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS)
-# include <wctype.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-#include <posix1_lim.h>
-#endif
-
-#include <pwd.h>
-#include <grp.h>
-
-#include <lib-lib/buffer.h>
-#include <lib-lib/hash.h>
-#include <lib-lib/list.h>
-#include <lib-lib/rx.h>
-
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
-#include "charset.h"
-
-#ifndef HAVE_WC_FUNCS
-# ifdef MB_LEN_MAX
-# undef MB_LEN_MAX
-# endif
-# define MB_LEN_MAX 16
-#endif
-
-# define MUTT_VERSION (VERSION)
+#define MUTT_VERSION (VERSION)
/* nifty trick I stole from ELM 2.5alpha. */
#ifdef MAIN_C
int op; /* function op */
} event_t;
-/* flags for _mutt_system() */
-#define M_DETACH_PROCESS 1 /* detach subprocess from group */
-
/* flags for mutt_FormatString() */
typedef enum {
M_FORMAT_FORCESUBJ = (1 << 0), /* print the subject even if unchanged */
OPTCOLLAPSEUNREAD,
OPTCONFIRMAPPEND,
OPTCONFIRMCREATE,
- OPTCOUNTATTACH,
OPTDELETEUNTAG,
OPTDELSP,
OPTDIGESTCOLLAPSE,
OPTFORWQUOTE,
#ifdef USE_HCACHE
OPTHCACHEVERIFY,
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
OPTHCACHECOMPRESS,
#endif /* HAVE_QDBM */
#endif
OPTPGPCHECKEXIT,
OPTPGPLONGIDS,
OPTPGPAUTODEC,
-#if 0
- OPTPGPENCRYPTSELF,
-#endif
OPTPGPRETAINABLESIG,
OPTPGPSTRICTENC,
OPTFORWDECRYPT,
OPTAUXSORT, /* (pseudo) using auxillary sort function */
OPTFORCEREFRESH, /* (pseudo) refresh even during macros */
- OPTLOCALES, /* (pseudo) set if user has valid locale definition */
OPTNOCURSES, /* (pseudo) when sending in batch mode */
OPTNEEDREDRAW, /* (pseudo) to notify caller of a submenu */
OPTSEARCHREVERSE, /* (pseudo) used by ci_search_command */
OPTMAX
};
-#define mutt_bit_alloc(n) calloc ((n + 7) / 8, sizeof (char))
+#define mutt_bit_alloc(n) p_new(char, (n + 7) / 8)
#define mutt_bit_set(v,n) v[n/8] |= (1 << (n % 8))
#define mutt_bit_unset(v,n) v[n/8] &= ~(1 << (n % 8))
#define mutt_bit_toggle(v,n) v[n/8] ^= (1 << (n % 8))
#define toggle_option(x) mutt_bit_toggle(Options,x)
#define option(x) mutt_bit_isset(Options,x)
-typedef struct spam_list_t {
- rx_t *rx;
- int nmatch;
- char *template;
- struct spam_list_t *next;
-} SPAM_LIST;
-
+int mutt_matches_ignore (const char *, string_list_t *);
-#define mutt_new_spam_list() p_new(SPAM_LIST, 1)
-void mutt_free_spam_list (SPAM_LIST **);
-
-int mutt_matches_ignore (const char *, LIST *);
-
-void mutt_init (int, LIST *);
+void mutt_init (int, string_list_t *);
typedef struct thread {
unsigned int fake_thread:1;
HEADER *sort_key;
} THREAD;
-
-/* flag to mutt_pattern_comp() */
-#define M_FULL_MSG (1<<0) /* enable body and header matching */
-
-typedef enum {
- M_MATCH_FULL_ADDRESS = 1
-} pattern_exec_flag;
-
-typedef struct pattern_t {
- short op;
- unsigned int not : 1;
- unsigned int alladdr : 1;
- unsigned int stringmatch : 1;
- int min;
- int max;
- struct pattern_t *next;
- struct pattern_t *child; /* arguments to logical op */
- char* str;
- regex_t *rx;
-} pattern_t;
+typedef struct compress_info compress_info;
+typedef struct pattern_t pattern_t;
typedef struct {
char *path;
short magic; /* mailbox type */
- void *compressinfo; /* compressed mbox module private data */
+ compress_info *cinfo; /* compressed mbox module private data */
char *realpath; /* path to compressed mailbox */
unsigned int locked:1; /* is the mailbox locked? */
#define M_PARTS_RECOUNT (1<<1) /* force recount */
#include "protos.h"
-#include "lib.h"
#include "globals.h"
#endif /* !_MUTT_H */