#define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB)
struct option_t {
- char *option;
+ const char *option;
short type;
short flags;
unsigned long data;
- char* init;
+ const char *init;
};
#define UL (unsigned long)
# ifndef USE_SSL
# define USE_SSL
# endif
-# ifndef USE_SOCKET
-# define USE_SOCKET
-# endif
# ifndef USE_LIBESMTP
# define USE_LIBESMTP
# endif
# ifndef USE_DOTLOCK
# define USE_DOTLOCK
# endif
-# ifndef DL_STANDALONE
-# define DL_STANDALONE
-# endif
# ifndef USE_HCACHE
# define USE_HCACHE
# endif
** is viewed it is passed as standard input to $$display_filter, and the
** filtered message is read from the standard output.
*/
-#if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
+#if defined(USE_DOTLOCK)
{"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"},
/*
** .pp
- ** Availability: Standalone and Dotlock
+ ** Availability: Dotlock
**
** .pp
** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by
/*
** .pp
** \fIThis is a read-only system property and, at runtime,
- ** specifies the last part of the full path or URI of the
- ** folder currently open (if any), i.e. everything after
- ** the last ``/''.\fP
+ ** specifies the actual name of the folder as far as it could
+ ** be detected.\fP
+ ** .pp
+ ** For detection, $$$folder is first taken into account
+ ** and simply stripped to form the result when a match is found. For
+ ** example, with $$$folder being \fTimap://host\fP and the folder is
+ ** \fTimap://host/INBOX/foo\fP, $$$muttng_folder_name will be just
+ ** \fTINBOX/foo\fP.)
+ ** .pp
+ ** Second, if the initial portion of a name is not $$$folder,
+ ** the result will be everything after the last ``/''.
+ ** .pp
+ ** Third and last, the result will be just the name if neither
+ ** $$$folder nor a ``/'' were found in the name.
*/
{"muttng_pwd", DT_SYS, R_NONE, 0, "" },
/*
** was connection lost.
*/
#endif
-#ifdef USE_SOCKET
{ "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" },
/*
** .pp
** .pp
** See also ``$$read_inc'' and ``$$write_inc''.
*/
-#endif
{"pager", DT_PATH, R_NONE, UL &Pager, "builtin"},
/*
** .pp
** The file which includes random data that is used to initialize SSL
** library functions.
*/
- {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "yes" },
+ {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" },
/*
** .pp
** Availability: SSL
** in the mailbox specified by this variable. Also see the ``$$postpone''
** variable.
*/
-#ifdef USE_SOCKET
{"preconnect", DT_STR, R_NONE, UL &Preconnect, "" },
/*
** .pp
** \fBNote:\fP For this example to work, you must be able to log in to the
** remote machine without having to enter a password.
*/
-#endif /* USE_SOCKET */
{"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" },
/*
** .pp
** \fBNote\fP: When you delete a message in the trash folder, it is really
** deleted, so that there is no way to recover mail.
*/
-#ifdef USE_SOCKET
{"tunnel", DT_STR, R_NONE, UL &Tunnel, "" },
/*
** .pp
** \fBNote:\fP For this example to work you must be able to log in to the remote
** machine without having to enter a password.
*/
-#endif
{"umask", DT_NUM, R_NONE, UL &Umask, "0077" },
/*
** .pp
*/
#endif
/*--*/
- { NULL }
+ { NULL, -1, R_NONE, -1, NULL }
};
static const char* Features[] = {
#ifdef USE_DOTLOCK
"dotlock",
#endif
-#ifdef DL_STANDALONE
- "standalone",
-#endif
#ifdef USE_POP
"pop",
#endif
#ifdef USE_LIBESMTP
"libesmtp",
#endif
-#ifdef USE_COMPRESSED
- "compessed",
-#endif
#ifdef HAVE_COLOR
"color",
#endif
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
- "classic_pgp",
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
- "class_smime",
-#endif
#ifdef CRYPT_BACKEND_GPGME
"gpgme",
#endif
{"date", SORT_DATE},
{"size", SORT_SIZE},
{"unsorted", SORT_ORDER},
- {NULL}
+ {NULL, 0}
};
const struct mapping_t SortAliasMethods[] = {
{"alias", SORT_ALIAS},
{"address", SORT_ADDRESS},
{"unsorted", SORT_ORDER},
- {NULL}
+ {NULL, 0}
};
const struct mapping_t SortKeyMethods[] = {
{"date", SORT_DATE},
{"keyid", SORT_KEYID},
{"trust", SORT_TRUST},
- {NULL}
+ {NULL, 0}
};
static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
struct command_t {
- char *name;
+ const char *name;
int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *);
unsigned long data;
- unsigned long data1;
};
struct command_t Commands[] = {
{"attachments", parse_attachments, 0 },
{"unattachments",parse_unattachments,0 },
{"unalternates", parse_unalternates, 0},
-#ifdef USE_SOCKET
{"account-hook", mutt_parse_hook, M_ACCOUNTHOOK},
-#endif
{"alias", parse_alias, 0},
{"auto_view", parse_list, UL &AutoViewList},
{"alternative_order", parse_list, UL &AlternativeOrderList},
{"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 USE_COMPRESSED
{"open-hook", mutt_parse_hook, M_OPENHOOK},
{"close-hook", mutt_parse_hook, M_CLOSEHOOK},
{"append-hook", mutt_parse_hook, M_APPENDHOOK},
-#endif
{"hdr_order", parse_list, UL &HeaderOrderList},
{"ifdef", parse_ifdef, 1},
{"ifndef", parse_ifdef, 0},
{"unscore", mutt_parse_unscore, 0},
{"unset", parse_set, M_SET_UNSET},
{"unsubscribe", parse_unsubscribe, 0},
- {NULL}
+ {NULL, NULL, 0}
};