#ifndef _GLOBALS_H
#define _GLOBALS_H
-#include "alias.h"
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
-
-#include "lib/list.h"
-
-WHERE void (*mutt_error) (const char *, ...);
-WHERE void (*mutt_message) (const char *, ...);
+WHERE void (*mutt_error) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
+WHERE void (*mutt_message) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
WHERE CONTEXT *Context;
WHERE char Errorbuf[STRING];
WHERE char AttachmentMarker[STRING];
-WHERE char Quotebuf[SHORT_STRING];
-
-WHERE char *MuttDotlock;
-
-WHERE address_t *EnvFrom;
-WHERE address_t *From;
+WHERE char Quotebuf[STRING];
-WHERE char *AliasFile;
-WHERE char *AliasFmt;
-WHERE char *AssumedCharset;
WHERE char *AttachSep;
WHERE char *Attribution;
WHERE char *AttachFormat;
-WHERE char *Charset;
WHERE char *ComposeFormat;
WHERE char *ConfigCharset;
WHERE char *ContentType;
WHERE char *DefaultHook;
WHERE char *DateFmt;
WHERE char *DisplayFilter;
-WHERE char *DsnNotify;
-WHERE char *DsnReturn;
-WHERE char *Editor;
WHERE char *EditorHeaders;
WHERE char *FileCharset;
WHERE char *FolderFormat;
WHERE char *ForwFmt;
-WHERE char *Fqdn;
WHERE char *HdrFmt;
-WHERE char *Homedir;
-WHERE char *Hostname;
WHERE char *ImapAuthenticators INITVAL (NULL);
WHERE char *ImapDelimChars INITVAL (NULL);
WHERE char *ImapPass INITVAL (NULL);
WHERE char *ImapUser INITVAL (NULL);
WHERE char *Inbox;
-WHERE char *Ispell;
WHERE char *Locale;
-WHERE char *MailcapPath;
WHERE char *Maildir;
#ifdef USE_HCACHE
WHERE rx_t QuoteRegexp;
WHERE rx_t ReplyRegexp;
WHERE rx_t Smileys;
-WHERE rx_t GecosMask;
WHERE rx_t StripWasRegexp;
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
WHERE short NetInc;
-#ifdef MIXMASTER
WHERE char *Mixmaster;
WHERE char *MixEntryFormat;
-#endif
-
-WHERE char *OperatingSystem INITVAL (NULL);
-
WHERE char *Muttrc INITVAL (NULL);
#ifdef USE_NNTP
WHERE char *NntpPass;
WHERE char *NewsRc;
#endif
-WHERE char *Outbox;
WHERE char *Pager;
WHERE char *PagerFmt;
WHERE char *PipeSep;
WHERE char *PrintCmd;
WHERE char *QueryCmd;
WHERE char *Realname;
-WHERE char *SendCharset;
-WHERE char *Sendmail;
-WHERE char *Shell;
WHERE char *SidebarDelim;
WHERE char *SidebarNumberFormat;
WHERE char *SidebarBoundary;
-WHERE char *Signature;
WHERE char *SignOffString;
WHERE char *SimpleSearch;
WHERE char *SmtpUseTLS;
#endif
WHERE char *Spoolfile;
-WHERE char *SpamSep;
#if defined(USE_SSL) || defined(USE_GNUTLS)
WHERE char *SslCertFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
-WHERE LIST *SslSessionCerts INITVAL (NULL);
+WHERE string_list_t *SslSessionCerts INITVAL (NULL);
#endif
#ifdef USE_GNUTLS
WHERE short SslDHPrimeBits;
#endif
WHERE char *StChars;
WHERE char *Status;
-WHERE char *Tempdir;
WHERE char *Tochars;
WHERE char *TrashPath;
-WHERE char *Username;
WHERE char *XtermTitle;
WHERE char *XtermLeave;
WHERE char *XtermIcon;
WHERE char *CurrentFolder;
WHERE char *LastFolder;
-WHERE LIST *AutoViewList INITVAL (0);
-WHERE LIST *AlternativeOrderList INITVAL (0);
-WHERE LIST *AttachAllow INITVAL(0);
-WHERE LIST *AttachExclude INITVAL(0);
-WHERE LIST *InlineAllow INITVAL(0);
-WHERE LIST *InlineExclude INITVAL(0);
-WHERE LIST *HeaderOrderList INITVAL (0);
-WHERE LIST *Ignore INITVAL (0);
-WHERE LIST *MimeLookupList INITVAL (0);
-WHERE LIST *UnIgnore INITVAL (0);
-
-WHERE list2_t *Alternates INITVAL (0);
-WHERE list2_t *UnAlternates INITVAL (0);
-WHERE list2_t *MailLists INITVAL (0);
-WHERE list2_t *UnMailLists INITVAL (0);
-WHERE list2_t *SubscribedLists INITVAL (0);
-WHERE list2_t *UnSubscribedLists INITVAL (0);
-WHERE SPAM_LIST *SpamList INITVAL (0);
-WHERE list2_t *NoSpamList INITVAL (0);
+WHERE string_list_t *AttachAllow INITVAL(0);
+WHERE string_list_t *AttachExclude INITVAL(0);
+WHERE string_list_t *InlineAllow INITVAL(0);
+WHERE string_list_t *InlineExclude INITVAL(0);
/* bit vector for boolean variables */
-#ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7) / 8];
-#else
-extern unsigned char Options[];
-#endif
+WHERE unsigned char Options[(OPTMAX + 7) / 8];
/* bit vector for the yes/no/ask variable type */
-#ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
-#else
-extern unsigned char QuadOptions[];
-#endif
-
-WHERE unsigned short Counter INITVAL (0);
+WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
#ifdef USE_NNTP
WHERE short NewsPollTimeout;
WHERE short PagerContext;
WHERE short PagerIndexLines;
WHERE short ReadInc;
-WHERE short SendmailWait;
WHERE short SleepTime INITVAL (1);
WHERE short Timeout;
WHERE short Umask INITVAL (0077);
WHERE int CurrentMenu;
-WHERE alias_t *Aliases INITVAL (0);
-WHERE LIST *UserHeader INITVAL (0);
+WHERE string_list_t *UserHeader INITVAL (0);
/*-- formerly in pgp.h --*/
WHERE rx_t PgpGoodSign;