X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=d468e6487456ba50d73c9675c3abd4abe7f8f7a7;hp=a2b4c3d575a1426c4b71b57978508be9566d4db1;hb=8fac066483c9ae3176984527c037190fca9dc7f0;hpb=3132c5f07ae687b5daac6b570347369967850863 diff --git a/init.h b/init.h index a2b4c3d..d468e64 100644 --- a/init.h +++ b/init.h @@ -17,7 +17,6 @@ # include "sort.h" #endif -#include "buffy.h" #include "mutt.h" #ifndef _MAKEDOC @@ -30,8 +29,6 @@ #define DT_SORT 6 /* sorting methods */ #define DT_RX 7 /* regular expressions */ #define DT_MAGIC 8 /* mailbox type */ -#define DT_SYN 9 /* synonym for another variable */ -#define DT_ADDR 10 /* e-mail address */ #define DTYPE(x) ((x) & DT_MASK) @@ -51,11 +48,13 @@ #define R_NONE 0 #define R_INDEX (1<<0) #define R_PAGER (1<<1) +#define R_BOTH (R_INDEX|R_PAGER) + +/* TODO:MC: will go in the the thread module */ #define R_RESORT (1<<2) /* resort the mailbox */ #define R_RESORT_SUB (1<<3) /* resort subthreads */ #define R_RESORT_INIT (1<<4) /* resort from scratch */ #define R_TREE (1<<5) /* redraw the thread tree */ -#define R_BOTH (R_INDEX|R_PAGER) #define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) struct option_t { @@ -70,25 +69,15 @@ struct option_t { #endif /* _MAKEDOC */ -#ifndef ISPELL -#define ISPELL "ispell" -#endif - /* build complete documentation */ #ifdef _MAKEDOC -# ifndef USE_SSL -# define USE_SSL -# endif # ifndef USE_LIBESMTP # define USE_LIBESMTP # endif # ifndef USE_NNTP # define USE_NNTP # endif -# ifndef USE_GNUTLS -# define USE_GNUTLS -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -136,29 +125,6 @@ struct option_t MuttVars[] = { ** check only happens after the \fIfirst\fP edit of the file). When set ** to \fIno\fP, composition will never be aborted. */ - {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.madmuttrc"}, - /* - ** .pp - ** The default file in which to save aliases created by the - ** ``$create-alias'' function. - ** .pp - ** \fBNote:\fP Madmutt will not automatically source this file; you must - ** explicitly use the ``$source'' command for it to be executed. - */ - {"alias_format", DT_STR, R_NONE, UL &AliasFmt, "%4n %2f %t %-10a %r"}, - /* - ** .pp - ** Specifies the format of the data displayed for the ``alias'' menu. The - ** following \fTprintf(3)\fP-style sequences are available: - ** .pp - ** .dl - ** .dt %a .dd alias name - ** .dt %f .dd flags - currently, a "d" for an alias marked for deletion - ** .dt %n .dd index number - ** .dt %r .dd address which alias expands to - ** .dt %t .dd character which indicates if the alias is tagged for inclusion - ** .de - */ {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" }, /* ** .pp @@ -203,23 +169,6 @@ struct option_t MuttVars[] = { ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before ** editing the body of an outgoing message. */ - {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"}, - /* - ** .pp - ** This variable is a colon-separated list of character encoding - ** schemes for messages without character encoding indication. - ** Header field values and message body content without character encoding - ** indication would be assumed that they are written in one of this list. - ** By default, all the header fields and message body without any charset - ** indication are assumed to be in \fTus-ascii\fP. - ** .pp - ** For example, Japanese users might prefer this: - ** .pp - ** \fTset assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"\fP - ** .pp - ** However, only the first content is valid for the message body. - ** This variable is valid only if $$strict_mime is unset. - */ #ifdef USE_NNTP {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, /* @@ -317,18 +266,6 @@ struct option_t MuttVars[] = { ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to ** make the next function apply to all tagged messages. */ - {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" }, - /* - ** .pp - ** When this variable is \fIset\fP, Madmutt will beep when an error occurs. - */ - {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" }, - /* - ** .pp - ** When this variable is \fIset\fP, Madmutt will beep whenever it prints a message - ** notifying you of new mail. This is independent of the setting of the - ** ``$$beep'' variable. - */ {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" }, /* ** .pp @@ -364,11 +301,6 @@ struct option_t MuttVars[] = { ** as read when you leaving it. */ #endif - {"charset", DT_STR, R_NONE, UL &Charset, "" }, - /* - ** .pp - ** Character set your terminal uses to display and enter textual data. - */ {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, /* ** .pp @@ -448,16 +380,6 @@ struct option_t MuttVars[] = { ** will be saved for later references. Also see ``$$record'', ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''. */ - {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" }, - /* - ** .pp - ** This variable controls the use the GPGME enabled crypto backends. - ** If it is \fIset\fP and Madmutt was build with gpgme support, the gpgme code for - ** S/MIME and PGP will be used instead of the classic code. - ** .pp - ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration - ** file as it won't have any effect when used interactively. - */ {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" }, /* ** .pp @@ -543,33 +465,6 @@ struct option_t MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ - {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""}, - /* - ** .pp - ** \fBNote:\fP you should not enable this unless you are using Sendmail - ** 8.8.x or greater or in connection with the SMTP support via libESMTP. - ** .pp - ** This variable sets the request for when notification is returned. The - ** string consists of a comma separated list (no spaces!) of one or more - ** of the following: \fInever\fP, to never request notification, - ** \fIfailure\fP, to request notification on transmission failure, - ** \fIdelay\fP, to be notified of message delays, \fIsuccess\fP, to be - ** notified of successful transmission. - ** .pp - ** Example: \fTset dsn_notify="failure,delay"\fP - */ - {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, ""}, - /* - ** .pp - ** \fBNote:\fP you should not enable this unless you are using Sendmail - ** 8.8.x or greater or in connection with the SMTP support via libESMTP. - ** .pp - ** This variable controls how much of your message is returned in DSN - ** messages. It may be set to either \fIhdrs\fP to return just the - ** message header, or \fIfull\fP to return the full message. - ** .pp - ** Example: \fTset dsn_return=hdrs\fP - */ {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" }, /* ** .pp @@ -603,13 +498,6 @@ struct option_t MuttVars[] = { ** Note: if $$edit_headers had to be turned on by force because ** $$strict_mailto is \fIunset\fP, this option has no effect. */ - {"editor", DT_PATH, R_NONE, UL &Editor, "" }, - /* - ** .pp - ** This variable specifies which editor is used by Madmutt. - ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment - ** variable, or to the string "\fTvi\fP" if neither of those are set. - */ {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" }, /* ** .pp @@ -625,25 +513,6 @@ struct option_t MuttVars[] = { ** you must take care of space-stuffing '\fP - ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address. - ** .pp - ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP. - */ - {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"}, - /* - ** .pp - ** A regular expression used by Madmutt to parse the GECOS field of a password - ** entry when expanding the alias. By default the regular expression is set - ** to ``\fT^[^,]*\fP'' which will return the string up to the first ``\fT,\fP'' encountered. - ** If the GECOS field contains a string like "lastname, firstname" then you - ** should do: \fTset gecos_mask=".*"\fP. - ** .pp - ** This can be useful if you see the following behavior: you address a e-mail - ** to user ID stevef whose full name is Steve Franklin. If Madmutt expands - ** stevef to ``Franklin'' stevef@foo.bar then you should set the gecos_mask to - ** a regular expression that will match the whole name so Madmutt will expand - ** ``Franklin'' to ``Franklin, Steve''. - */ #ifdef USE_NNTP {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, /* @@ -928,15 +754,6 @@ struct option_t MuttVars[] = { ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is ** honored when group-replying to a message. */ - {"hostname", DT_STR, R_NONE, UL &Fqdn, "" }, - /* - ** .pp - ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail - ** addresses and during generation of \fTMessage-ID:\fP headers. - ** .pp - ** Please be sure to really know what you are doing when changing this variable - ** to configure a custom domain part of Message-IDs. - */ {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" }, /* ** .pp @@ -1203,11 +1020,6 @@ struct option_t MuttVars[] = { ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP */ #endif - {"ispell", DT_PATH, R_NONE, UL &Ispell, ISPELL}, - /* - ** .pp - ** How to invoke ispell (GNU's spell-checking software). - */ {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, /* ** .pp @@ -1243,30 +1055,6 @@ struct option_t MuttVars[] = { ** to this length. A value of 0 (which is also the default) means that the ** maximum line length is determined by the terminal width and $$wrapmargin. */ - {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, "5" }, - /* - ** .pp - ** This variable configures how often (in seconds) Madmutt should look for - ** new mail. - ** .pp - ** \fBNote:\fP This does not apply to IMAP mailboxes, see $$imap_mail_check. - */ - {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, "" }, - /* - ** .pp - ** This variable specifies which files to consult when attempting to - ** display MIME bodies not directly supported by Madmutt. - */ - {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will restrict possible characters in mailcap \fT%\fP expandos - ** to a well-defined set of safe characters. This is the safe setting, - ** but we are not sure it doesn't break some more advanced MIME stuff. - ** .pp - ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE - ** DOING!\fP - */ #ifdef USE_HCACHE {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" }, /* @@ -1359,15 +1147,6 @@ struct option_t MuttVars[] = { ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" }, - /* - ** .pp - ** This specifies the operating system name for the \fTUser-Agent:\fP header field. If - ** this is \fIunset\fP, it will be set to the operating system name that \fTuname(2)\fP - ** returns. If \fTuname(2)\fP fails, ``UNIX'' will be used. - ** .pp - ** It may, for example, look as: ``\fTMadmutt 1.5.9i (Linux)\fP''. - */ {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." }, /* ** .pp @@ -1529,19 +1308,6 @@ struct option_t MuttVars[] = { ** menu, attachments which cannot be decoded in a reasonable manner will ** be attached to the newly composed message if this option is set. */ -#ifdef USE_NNTP - {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIunset\fP, an 8-bit ``\fTSubject:\fP'' header field in a news article - ** will not be encoded according to RFC2047. - ** .pp - ** \fBNote:\fP Only change this setting if you know what you are doing. - */ -#endif {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"}, /* ** .pp @@ -1737,19 +1503,6 @@ struct option_t MuttVars[] = { ** .pp ** See also ``$$read_inc'' and ``$$write_inc''. */ - {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, - /* - ** .pp - ** This variable specifies which pager you would like to use to view - ** messages. ``builtin'' means to use the builtin pager, otherwise this - ** variable should specify the pathname of the external pager you would - ** like to use. - ** .pp - ** Using an external pager may have some disadvantages: Additional - ** keystrokes are necessary because you can't call Madmutt functions - ** directly from the pager, and screen resizes cause lines longer than - ** the screen width to be badly formatted in the help menu. - */ {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" }, /* ** .pp @@ -1811,14 +1564,6 @@ struct option_t MuttVars[] = { ** settings can be overridden by use of the \fIsmime-menu\fP. ** (Crypto only) */ - {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to ignore OpenPGP subkeys. Instead, - ** the principal key will inherit the subkeys' capabilities. \fIUnset\fP this - ** if you want to play interesting key selection games. - ** (PGP only) - */ {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" }, /* ** .pp @@ -1846,21 +1591,6 @@ struct option_t MuttVars[] = { ** to find out whether an encrypted message is also signed. ** (Crypto only) */ - {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding - ** PGP or S/MIME output, so spoofing such lines is more difficult. - ** If you are using colors to mark these lines, and rely on these, - ** you may \fIunset\fP this setting. - ** (Crypto only) - */ - {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process. - ** (PGP only) - */ {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" }, /* ** .pp @@ -1882,22 +1612,6 @@ struct option_t MuttVars[] = { ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.) ** (S/MIME only) */ - {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" }, - /* - ** .pp - ** This flag controls whether you want to be asked to enter a label - ** for a certificate about to be added to the database or not. It is - ** \fIset\fP by default. - ** (S/MIME only) - */ - {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" }, - /* - ** .pp - ** If \fIset\fP (default) this tells Madmutt to use the default key for decryption. Otherwise, - ** if manage multiple certificate-key-pairs, Madmutt will try to use the mailbox-address - ** to determine the key to use. It will ask you to supply a key, if it can't find one. - ** (S/MIME only) - */ {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"}, /* ** .pp @@ -1919,29 +1633,6 @@ struct option_t MuttVars[] = { ** .pp ** (PGP only) */ - {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" }, - /* - ** .pp - ** If you assign a text to this variable, then a PGP signature is only - ** considered verified if the output from $$pgp_verify_command contains - ** the text. Use this variable if the exit code from the command is 0 - ** even for bad signatures. - ** (PGP only) - */ - {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when - ** signing or encrypting. A non-zero exit code means that the - ** subprocess failed. - ** (PGP only) - */ - {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" }, - /* - ** .pp - ** If \fIset\fP, use 64 bit PGP key IDs. \fIUnset\fP uses the normal 32 bit Key IDs. - ** (PGP only) - */ {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" }, /* ** .pp @@ -1953,46 +1644,6 @@ struct option_t MuttVars[] = { ** removed, while the inner multipart/signed part is retained. ** (PGP only) */ - {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" }, - /* - ** .pp - ** This option controls whether Madmutt generates old-style inline - ** (traditional) PGP encrypted or signed messages under certain - ** circumstances. This can be overridden by use of the \fIpgp-menu\fP, - ** when inline is not required. - ** .pp - ** Note that Madmutt might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Madmutt can be - ** configured to ask before sending PGP/MIME messages when inline - ** (traditional) would not work. - ** See also: ``$$pgp_mime_auto''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to always attempt to - ** create an inline (traditional) message when replying to a - ** message which is PGP encrypted/signed inline. This can be - ** overridden by use of the \fIpgp-menu\fP, when inline is not - ** required. This option does not automatically detect if the - ** (replied-to) message is inline; instead it relies on Madmutt - ** internals for previously checked/flagged messages. - ** .pp - ** Note that Madmutt might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Madmutt can be - ** configured to ask before sending PGP/MIME messages when inline - ** (traditional) would not work. - ** See also: ``$$pgp_mime_auto''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - ** - */ {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" }, /* ** .pp @@ -2009,22 +1660,6 @@ struct option_t MuttVars[] = { ** keyid form to specify your key (e.g., ``\fT0x00112233\fP''). ** (PGP only) */ - {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as - ** \fTquoted-printable\fP. Please note that unsetting this variable may - ** lead to problems with non-verifyable PGP signatures, so only change - ** this if you know what you are doing. - ** (PGP only) - */ - {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. Default: 300. - ** (PGP only) - */ {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" }, /* ** .pp @@ -2042,17 +1677,6 @@ struct option_t MuttVars[] = { ** ``reverse-''. ** (PGP only) */ - {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" }, - /* - ** .pp - ** This option controls whether Madmutt will prompt you for - ** automatically sending a (signed/encrypted) message using - ** PGP/MIME when inline (traditional) fails (for any reason). - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" }, /* ** .pp @@ -2064,119 +1688,6 @@ struct option_t MuttVars[] = { ** check the message for traditional pgp. */ /* XXX Default values! */ - {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" }, - /* - ** .pp - ** This format strings specifies a command which is used to decode - ** application/pgp attachments. - ** .pp - ** The PGP command formats have their own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %p .dd Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty - ** string otherwise. Note: This may be used with a %? construct. - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %a .dd The value of $$pgp_sign_as. - ** .dt %r .dd One or more key IDs. - ** .de - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (PGP only) - */ - {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" }, - /* - ** .pp - ** This command is invoked whenever Madmutt will need public key information. - ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format. - ** (PGP only) - */ - {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify PGP signatures. - ** (PGP only) - */ - {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" }, - /* - ** .pp - ** This command is used to decrypt a PGP encrypted message. - ** (PGP only) - */ - {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" }, - /* - ** .pp - ** This format is used to create a old-style ``clearsigned'' PGP message. - ** .pp - ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, - /* - ** .pp - ** This command is used to create the detached PGP signature for a - ** multipart/signed PGP/MIME body part. - ** (PGP only) - */ - {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" }, - /* - ** .pp - ** This command is used to both sign and encrypt a body part. - ** (PGP only) - */ - {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" }, - /* - ** .pp - ** This command is used to encrypt a body part without signing it. - ** (PGP only) - */ - {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, - /* - ** .pp - ** This command is used to import a key from a message into - ** the user's public key ring. - ** (PGP only) - */ - {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" }, - /* - ** .pp - ** This command is used to export a public key from the user's - ** key ring. - ** (PGP only) - */ - {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" }, - /* - ** .pp - ** This command is used to verify key information from the key selection - ** menu. - ** (PGP only) - */ - {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" }, - /* - ** .pp - ** This command is used to list the secret key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ - {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" }, - /* - ** .pp - ** This command is used to list the public key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp @@ -2186,13 +1697,6 @@ struct option_t MuttVars[] = { ** ``$$mime_forward_decode'' is \fIunset\fP. ** (PGP only) */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. - ** (S/MIME only) - */ {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" }, /* ** .pp @@ -2203,131 +1707,6 @@ struct option_t MuttVars[] = { ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. ** (S/MIME only) */ - {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage ad retrieval of keys/certs by itself. This is very basic right now, - ** and stores keys and certificates in two different directories, both - ** named as the hash-value retrieved from OpenSSL. There is an index file - ** which contains mailbox-address keyid pair, and which can be manually - ** edited. This one points to the location of the private keys. - ** (S/MIME only) - */ - {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" }, - /* - ** .pp - ** This variable contains the name of either a directory, or a file which - ** contains trusted certificates for use with OpenSSL. - ** (S/MIME only) - */ - {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage and retrieval of keys by itself. This is very basic right - ** now, and keys and certificates are stored in two different - ** directories, both named as the hash-value retrieved from - ** OpenSSL. There is an index file which contains mailbox-address - ** keyid pairs, and which can be manually edited. This one points to - ** the location of the certificates. - ** (S/MIME only) - */ - {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" }, - /* - ** .pp - ** This format string specifies a command which is used to decrypt - ** \fTapplication/x-pkcs7-mime\fP attachments. - ** .pp - ** The OpenSSL command formats have their own set of \fTprintf(3)\fP-like sequences - ** similar to PGP's: - ** .pp - ** .dl - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %k .dd The key-pair specified with $$smime_default_key - ** .dt %c .dd One or more certificate IDs. - ** .dt %a .dd The algorithm used for encryption. - ** .dt %C .dd CA location: Depending on whether $$smime_ca_location - ** . points to a directory or file, this expands to - ** . "-CApath $$smime_ca_location" or "-CAfile $$smime_ca_location". - ** .de - ** .pp - ** For examples on how to configure these formats, see the smime.rc in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (S/MIME only) - */ - {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP. - ** (S/MIME only) - */ - {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type - ** \fTapplication/x-pkcs7-mime\fP. - ** (S/MIME only) - */ - {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTmultipart/signed\fP, which can be read by all mail clients. - ** (S/MIME only) - */ - {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTapplication/x-pkcs7-signature\fP, which can only be handled by mail - ** clients supporting the S/MIME extension. - ** (S/MIME only) - */ - {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" }, - /* - ** .pp - ** This command is used to create encrypted S/MIME messages. - ** (S/MIME only) - */ - {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" }, - /* - ** .pp - ** This command is used to extract PKCS7 structures of S/MIME signatures, - ** in order to extract the public X509 certificate(s). - ** (S/MIME only) - */ - {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" }, - /* - ** .pp - ** This command is used to extract X509 certificates from a PKCS7 structure. - ** (S/MIME only) - */ - {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" }, - /* - ** .pp - ** This command is used to extract only the signers X509 certificate from a S/MIME - ** signature, so that the certificate's owner may get compared to the - ** email's ``\fTFrom:\fP'' header field. - ** (S/MIME only) - */ - {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" }, - /* - ** .pp - ** This command is used to import a certificate via \fTsmime_keysng\fP. - ** (S/MIME only) - */ - {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" }, - /* - ** .pp - ** This command is used to extract the mail address(es) used for storing - ** X509 certificates, and for verification purposes (to check whether the - ** certificate was issued for the sender's mailbox). - ** (S/MIME only) - */ {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" }, /* ** .pp @@ -2336,7 +1715,6 @@ struct option_t MuttVars[] = { ** (S/MIME only) */ #if defined(USE_LIBESMTP) - {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0}, {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" }, /* ** .pp @@ -2346,7 +1724,6 @@ struct option_t MuttVars[] = { ** Defines the username to use with SMTP AUTH. Setting this variable will ** cause Madmutt to attempt to use SMTP AUTH when sending. */ - {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0}, {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" }, /* ** .pp @@ -2361,7 +1738,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 }, {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, /* ** .pp @@ -2399,18 +1775,6 @@ struct option_t MuttVars[] = { ** Madmutt still needs to have SSL support enabled in order to use it. */ #endif -#if defined(USE_SSL) || defined(USE_GNUTLS) -#ifdef USE_SSL - {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file containing a client certificate and its associated private - ** key. - */ -#endif /* USE_SSL */ {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" }, /* ** .pp @@ -2448,36 +1812,6 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset certificate_file=~/.madmutt/certificates\fP */ -# if defined(_MAKEDOC) || !defined (USE_GNUTLS) - {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will use CA certificates in the - ** system-wide certificate store when checking if server certificate - ** is signed by a trusted CA. - */ - {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file which includes random data that is used to initialize SSL - ** library functions. - */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** This variables specifies whether to attempt to use SSLv2 in the - ** SSL authentication process. - */ -# endif /* _MAKEDOC || !USE_GNUTLS */ {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, "yes" }, /* ** .pp @@ -2496,7 +1830,6 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use TLSv1 in the ** SSL authentication process. */ -# ifdef USE_GNUTLS {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, "0" }, /* ** .pp @@ -2516,8 +1849,6 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP */ -# endif /* USE_GNUTLS */ -# endif /* USE_SSL || USE_GNUTLS */ {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" }, /* ** .pp @@ -2565,7 +1896,6 @@ struct option_t MuttVars[] = { ** methods are unavailable. If a method is available but authentication ** fails, Madmutt will not connect to the POP server. */ - {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, /* ** .pp @@ -2621,12 +1951,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""}, - /* - ** .pp - ** Similar to the ``$$attribution'' variable, Madmutt will append this - ** string after the inclusion of a message which is being replied to. - */ #ifdef USE_NNTP {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, /* @@ -2725,14 +2049,6 @@ struct option_t MuttVars[] = { ** with the query string the user types. See ``$query'' for more ** information. */ - {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" }, - /* - ** .pp - ** This variable controls whether ``quit'' and ``exit'' actually quit - ** from Madmutt. If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they - ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are - ** prompted for confirmation when you try to quit. - */ {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" }, /* ** .pp @@ -2797,17 +2113,6 @@ struct option_t MuttVars[] = { ** Setting this variable to \fIyes\fP is not generally useful, and thus not ** recommended. */ - {"record", DT_PATH, R_NONE, UL &Outbox, ""}, - /* - ** .pp - ** This specifies the file into which your outgoing messages should be - ** appended. (This is meant as the primary method for saving a copy of - ** your messages, but another way to do this is using the ``$my_hdr'' - ** command to create a \fTBcc:\fP header field with your email address in it.) - ** .pp - ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and - ** ``$$save_name'' variables, and the ``$fcc-hook'' command. - */ {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, /* ** .pp @@ -2939,34 +2244,6 @@ struct option_t MuttVars[] = { ** Madmutt scores are always greater than or equal to zero, the default setting ** of this variable will never mark a message read. */ - {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"}, - /* - ** .pp - ** A list of character sets for outgoing messages. Madmutt will use the - ** first character set into which the text can be converted exactly. - ** If your ``$$charset'' is not \fTiso-8859-1\fP and recipients may not - ** understand \fTUTF-8\fP, it is advisable to include in the list an - ** appropriate widely used standard character set (such as - ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either - ** instead of or after \fTiso-8859-1\fP. - */ - {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" }, - /* - ** .pp - ** Specifies the number of seconds to wait for the ``$$sendmail'' process - ** to finish before giving up and putting delivery in the background. - ** .pp - ** Madmutt interprets the value of this variable as follows: - ** .dl - ** .dt >0 .dd number of seconds to wait for sendmail to finish before continuing - ** .dt 0 .dd wait forever for sendmail to finish - ** .dt <0 .dd always put sendmail in the background without waiting - ** .de - ** .pp - ** Note that if you specify a value other than 0, the output of the child - ** process will be put in a temporary file. If there is some error, you - ** will be informed as to where to find the output. - */ #ifdef USE_NNTP {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, /* @@ -3012,22 +2289,6 @@ struct option_t MuttVars[] = { ** For example, Madmutt has the ability to highlight ** the signature in a different color in the builtin pager. */ - {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" }, - /* - ** .pp - ** If \fIset\fP, the signature will be included before any quoted or forwarded - ** text. It is \fBstrongly\fP recommended that you do not set this variable - ** unless you really know what you are doing, and are prepared to take - ** some heat from netiquette guardians. - */ - {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"}, - /* - ** .pp - ** Specifies the filename of your signature, which is appended to all - ** outgoing messages. If the filename ends with a pipe (``\fT|\fP''), it is - ** assumed that filename is a shell command and input should be read from - ** its stdout. - */ {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" }, /* ** .pp @@ -3156,15 +2417,6 @@ struct option_t MuttVars[] = { ** Madmutt will attach the message whether or not this is the case, ** as long as the non-``$$reply_regexp'' parts of both messages are identical. */ - {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","}, - /* - ** .pp - ** ``$spam_separator'' controls what happens when multiple spam headers - ** are matched: if \fIunset\fP, each successive header will overwrite any - ** previous matches value for the spam label. If \fIset\fP, each successive - ** match will append to the previous, using ``$spam_separator'' as a - ** separator. - */ {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" }, /* ** .pp @@ -3358,14 +2610,6 @@ struct option_t MuttVars[] = { ** checking for new mail. A value of zero or less will cause Madmutt ** to never time out. */ - {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" }, - /* - ** .pp - ** This variable allows you to specify where Madmutt will place its - ** temporary files needed for displaying and composing messages. If - ** this variable is not set, the environment variable \fT$$$TMPDIR\fP is - ** used. If \fT$$$TMPDIR\fP is not set then "\fT/tmp\fP" is used. - */ {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"}, /* ** .pp @@ -3408,25 +2652,6 @@ struct option_t MuttVars[] = { ** This sets the umask that will be used by Madmutt when creating all ** kinds of files. If \fIunset\fP, the default value is \fT077\fP. */ - {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, "no" }, - /* - ** .pp - ** \fBWarning:\fP do not set this variable unless you are using a version - ** of sendmail which supports the \fT-B8BITMIME\fP flag (such as sendmail - ** 8.8.x) or in connection with the SMTP support via libESMTP. - ** Otherwise you may not be able to send mail. - ** .pp - ** When \fIset\fP, Madmutt will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP - ** flag when sending 8-bit messages to enable ESMTP negotiation or tell - ** libESMTP to do so. - */ - {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" }, - /* - ** .pp - ** When \fIset\fP, Madmutt will qualify all local addresses (ones without the - ** @host portion) with the value of ``$$hostname''. If \fIunset\fP, no - ** addresses will be qualified. - */ {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" }, /* ** .pp @@ -3457,7 +2682,6 @@ struct option_t MuttVars[] = { ** Normally, the default should work. */ #endif /* HAVE_GETADDRINFO */ - {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 }, {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" }, /* ** .pp @@ -3562,8 +2786,6 @@ struct option_t MuttVars[] = { */ #endif /*--*/ - {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" }, - {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"}, { NULL, -1, R_NONE, -1, NULL } }; @@ -3628,26 +2850,14 @@ const struct mapping_t SortKeyMethods[] = { /* functions used to parse commands in a rc file */ -static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_attachments (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unattachments (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_set (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_my_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unmy_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unsubscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *); - -static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); struct command_t { const char *name; @@ -3656,22 +2866,16 @@ struct command_t { }; struct command_t Commands[] = { - {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES}, - {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES}, {"bind", mutt_parse_bind, 0}, {"color", mutt_parse_color, 0}, {"exec", mutt_parse_exec, 0}, {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, - {"charset-hook", mutt_parse_hook, M_CHARSETHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, -#ifdef HAVE_ICONV - {"iconv-hook", mutt_parse_hook, M_ICONVHOOK}, -#endif {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, {"open-hook", mutt_parse_hook, M_OPENHOOK}, @@ -3689,33 +2893,15 @@ struct command_t Commands[] = { {"unmono", mutt_parse_unmono, 0}, {"unscore", mutt_parse_unscore, 0}, {"alias", parse_alias, 0}, - {"alternates", parse_alternates, 0}, {"attachments", parse_attachments, 0 }, - {"ignore", parse_ignore, 0}, - {"alternative_order", parse_list, UL &AlternativeOrderList}, - {"auto_view", parse_list, UL &AutoViewList}, - {"hdr_order", parse_list, UL &HeaderOrderList}, - {"mime_lookup", parse_list, UL &MimeLookupList}, - {"lists", parse_lists, 0}, {"my_hdr", parse_my_hdr, 0}, {"reset", parse_set, M_SET_RESET}, {"set", parse_set, 0}, {"toggle", parse_set, M_SET_INV}, {"unset", parse_set, M_SET_UNSET}, {"source", parse_source, 0}, - {"nospam", parse_spam_list, M_NOSPAM}, - {"spam", parse_spam_list, M_SPAM}, - {"subscribe", parse_subscribe, 0}, {"unalias", parse_unalias, 0}, - {"unalternates", parse_unalternates, 0}, {"unattachments", parse_unattachments, 0}, - {"unignore", parse_unignore, 0}, - {"unlists", parse_unlists, 0}, - {"unalternative_order", parse_unlist, UL &AlternativeOrderList}, - {"unauto_view", parse_unlist, UL &AutoViewList}, - {"unhdr_order", parse_unlist, UL &HeaderOrderList}, - {"unmime_lookup", parse_unlist, UL &MimeLookupList}, {"unmy_hdr", parse_unmy_hdr, 0}, - {"unsubscribe", parse_unsubscribe, 0}, {NULL, NULL, 0} };