# include "config.h"
#endif
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/utsname.h>
+#include <errno.h>
+#include <sys/wait.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
+#include <lib-lib/rx.h>
+
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_ssl.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/history.h>
#include "mutt.h"
-#include "mapping.h"
-#include "mutt_curses.h"
-#include "history.h"
#include "keymap.h"
-#include "mbyte.h"
#include "charset.h"
#include "thread.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-#include "mutt_ssl.h"
-#endif
-
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
#include "mutt_libesmtp.h"
#endif
+#include "alias.h"
#include "mx.h"
#include "init.h"
-#include "lib/rx.h"
#include "lib/list.h"
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#include <sys/wait.h>
/*
* prototypes
static const struct mapping_t* get_sortmap (struct option_t* option);
static int parse_sort (struct option_t* dst, const char *s,
const struct mapping_t *map,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static HASH *ConfigOptions = NULL;
/* prototypes for checking for special vars */
static int check_dsn_return (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int check_dsn_notify (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int check_history (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
/* this checks that numbers are >= 0 */
static int check_num (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
-#ifdef DEBUG
-static int check_debug (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
-#endif
+ char* errbuf, ssize_t errlen);
/* use this to check only */
static int check_special (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
/* variable <-> sanity check function mappings
* when changing these, make sure the proper _from_string handler
static struct {
const char* name;
int (*check) (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
} SpecialVars[] = {
{ "dsn_notify", check_dsn_notify },
{ "dsn_return", check_dsn_return },
#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
-#ifdef DEBUG
- { "debug_level", check_debug },
-#endif
/* last */
{ NULL, NULL }
};
/* protos for config type handles: convert value to string */
-static void bool_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void num_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void str_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void quad_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void sort_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void rx_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void magic_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void addr_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void user_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void sys_to_string (char* dst, size_t dstlen, struct option_t* option);
+static void bool_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void num_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void str_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void quad_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void sort_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void rx_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void magic_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void addr_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void user_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void sys_to_string (char* dst, ssize_t dstlen, struct option_t* option);
/* protos for config type handles: convert to value from string */
static int bool_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int num_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int str_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int sort_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int rx_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static struct {
unsigned short type;
- void (*opt_to_string) (char* dst, size_t dstlen, struct option_t* option);
+ void (*opt_to_string) (char* dst, ssize_t dstlen, struct option_t* option);
int (*opt_from_string) (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
} FuncTable[] = {
{ 0, NULL, NULL }, /* there's no DT_ type with 0 */
{ DT_BOOL, bool_to_string, bool_from_string },
{ DT_SYS, sys_to_string, NULL },
};
-static void bool_to_string (char* dst, size_t dstlen,
+static void bool_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=%s", option->option,
option (option->data) ? "yes" : "no");
}
static int bool_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)),
+ ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst)
return (1);
}
-static void num_to_string (char* dst, size_t dstlen,
+static void num_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
/* XXX puke */
- const char* fmt = (str_cmp (option->option, "umask") == 0) ?
+ const char* fmt = (m_strcmp(option->option, "umask") == 0) ?
"%s=%04o" : "%s=%d";
snprintf (dst, dstlen, fmt, option->option,
*((short*) option->data));
}
static int num_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int num = 0, old = 0;
char* t = NULL;
return (1);
}
-static void str_to_string (char* dst, size_t dstlen,
+static void str_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
NONULL (*((char**) option->data)));
}
-static void user_to_string (char* dst, size_t dstlen,
+static void user_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
NONULL (((char*) option->data)));
}
-static void sys_to_string (char* dst, size_t dstlen,
+static void sys_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
char *val = NULL, *t = NULL;
int clean = 0;
- /* get some $muttng_ values dynamically */
- if (ascii_strcmp ("muttng_pwd", option->option) == 0) {
+ /* get some $madmutt_ values dynamically */
+ if (ascii_strcmp ("madmutt_pwd", option->option) == 0) {
val = p_new(char, _POSIX_PATH_MAX);
val = getcwd (val, _POSIX_PATH_MAX-1);
clean = 1;
- } else if (ascii_strcmp ("muttng_folder_path", option->option) == 0 &&
+ } else if (ascii_strcmp ("madmutt_folder_path", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
- } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
+ } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
- size_t Maildirlength = m_strlen(Maildir);
+ ssize_t Maildirlength = m_strlen(Maildir);
/*
* if name starts with $folder, just strip it to keep hierarchy
* $folder=imap://host, path=imap://host/inbox/b -> inbox/b
*/
- if (Maildirlength > 0 && str_ncmp (CurrentFolder, Maildir,
+ if (Maildirlength > 0 && m_strncmp(CurrentFolder, Maildir,
Maildirlength) == 0 &&
m_strlen(CurrentFolder) > Maildirlength) {
val = CurrentFolder + Maildirlength;
val = t+1;
/* default: use as-is */
else
- val = CurrentFolder;
+ val = (char *) CurrentFolder;
} else
- val = option->init;
+ val = (char *) option->init;
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
if (clean)
}
static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
char path[_POSIX_PATH_MAX];
if (!dst)
}
path[0] = '\0';
- strfcpy (path, val, sizeof(path));
+ m_strcpy(path, sizeof(path), val);
mutt_expand_path (path, sizeof(path));
- str_replace ((char **) dst->data, path);
+ m_strreplace((char **) dst->data, path);
return (1);
}
static int str_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
if (!dst)
return (0);
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
return (0);
- str_replace ((char**) dst->data, val);
+ m_strreplace((char**) dst->data, val);
return (1);
}
static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
/* if dst == NULL, we may get here in case the user did unset it,
* see parse_set() where item is free()'d before coming here; so
* just silently ignore it */
dst->data = (unsigned long) m_strdup(val);
else {
char* s = (char*) dst->data;
- str_replace (&s, val);
+ m_strreplace(&s, val);
}
if (m_strlen(dst->init) == 0)
dst->init = m_strdup((char*) dst->data);
return (1);
}
-static void quad_to_string (char* dst, size_t dstlen,
+static void quad_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
snprintf (dst, dstlen, "%s=%s", option->option,
}
static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst)
return (1);
}
-static void sort_to_string (char* dst, size_t dstlen,
+static void sort_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const struct mapping_t *map = get_sortmap (option);
const char *p = NULL;
}
static int sort_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
const struct mapping_t *map = NULL;
if (!(map = get_sortmap (dst))) {
if (errbuf)
return (1);
}
-static void rx_to_string (char* dst, size_t dstlen,
+static void rx_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
rx_t* p = (rx_t*) option->data;
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
}
static int rx_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
rx_t* p = NULL;
regex_t* rx = NULL;
int flags = 0, e = 0, not = 0;
if (!dst)
return (0);
- if (option (OPTATTACHMSG) && !str_cmp (dst->option, "reply_regexp")) {
+ if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
if (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
p = (rx_t*) dst->data;
/* something to do? */
- if (!val || !*val || (p->pattern && str_cmp (p->pattern, val) == 0))
+ if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
return (1);
- if (str_cmp (dst->option, "mask") != 0)
+ if (m_strcmp(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
s = (char*) val;
- if (str_cmp (dst->option, "mask") == 0 && *s == '!') {
+ if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
not = 1;
s++;
}
p_delete(&p->rx);
}
- str_replace (&p->pattern, val);
+ m_strreplace(&p->pattern, val);
p->rx = rx;
p->not = not;
- if (str_cmp (dst->option, "reply_regexp") == 0)
+ if (m_strcmp(dst->option, "reply_regexp") == 0)
mutt_adjust_all_subjects ();
return (1);
}
-static void magic_to_string (char* dst, size_t dstlen,
+static void magic_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const char* s = NULL;
switch (option->data) {
}
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst || !val || !*val)
}
-static void addr_to_string (char* dst, size_t dstlen,
+static void addr_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
- rfc822_write_address (s, sizeof(s), *((ADDRESS**) option->data), 0);
+ rfc822_write_address (s, sizeof(s), *((address_t**) option->data), 0);
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
if (!dst)
return (0);
- rfc822_free_address ((ADDRESS**) dst->data);
+ address_list_wipe((address_t**) dst->data);
if (val && *val)
- *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
+ *((address_t**) dst->data) = rfc822_parse_adrlist (NULL, val);
return (1);
}
-int mutt_option_value (const char* val, char* dst, size_t dstlen) {
+int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
struct option_t* option = NULL;
char* tmp = NULL, *t = NULL;
- size_t l = 0;
+ ssize_t l = 0;
if (!(option = hash_find (ConfigOptions, val))) {
- debug_print (1, ("var '%s' not found\n", val));
*dst = '\0';
return (0);
}
/* as we get things of type $var=value and don't want to bloat the
* above "just" for expansion, we do the stripping here */
- debug_print (1, ("orig == '%s'\n", tmp));
t = strchr (tmp, '=');
t++;
l = m_strlen(t);
}
memcpy (dst, t, l+1);
p_delete(&tmp);
- debug_print (1, ("stripped == '%s'\n", dst));
return (1);
}
/* not reached */
}
-static void add_to_list (LIST ** list, const char *str)
+static void add_to_list (string_list_t ** list, const char *str)
{
- LIST *t, *last = NULL;
+ string_list_t *t, *last = NULL;
/* don't add a NULL or empty string to the list */
if (!str || *str == '\0')
}
if (!*list || last) {
- t = p_new(LIST, 1);
+ t = p_new(string_list_t, 1);
t->data = m_strdup(str);
if (last) {
last->next = t;
i = rx_lookup ((*list), rx->pattern);
if (i >= 0)
- rx_free (&rx);
+ rx_delete(&rx);
else
list_push_back (list, rx);
return 0;
spam = *list;
if (!spam)
return 0;
- if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
+ if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
*list = spam->next;
- rx_free (&spam->rx);
+ rx_delete(&spam->rx);
p_delete(&spam->template);
p_delete(&spam);
return 1;
prev = spam;
for (spam = prev->next; spam;) {
- if (!str_cmp (spam->rx->pattern, pat)) {
+ if (!m_strcmp(spam->rx->pattern, pat)) {
prev->next = spam->next;
- rx_free (&spam->rx);
+ rx_delete(&spam->rx);
p_delete(&spam->template);
p_delete(&spam);
spam = prev->next;
}
-static void remove_from_list (LIST ** l, const char *str)
+static void remove_from_list (string_list_t ** l, const char *str)
{
- LIST *p, *last = NULL;
+ string_list_t *p, *last = NULL;
- if (str_cmp ("*", str) == 0)
- mutt_free_list (l); /* ``unCMD *'' means delete all current entries */
+ if (m_strcmp("*", str) == 0)
+ string_list_wipe(l); /* ``unCMD *'' means delete all current entries */
else {
p = *l;
last = NULL;
{
int i = 0;
- if (str_cmp ("*", str) == 0) {
- list_del (l, (list_del_t*) rx_free);
+ if (m_strcmp("*", str) == 0) {
+ list_del (l, (list_del_t*) rx_delete);
return (0);
}
else {
i = rx_lookup ((*l), str);
if (i >= 0) {
rx_t* r = list_pop_idx ((*l), i);
- rx_free (&r);
+ rx_delete(&r);
return (0);
}
}
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
- int i, j, res = 0;
+ int i, j;
+ unsigned long res = 0;
BUFFER token;
struct option_t* option = NULL;
return 0;
}
-static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
return 0;
}
-static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_ignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
return 0;
}
-static int parse_list (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_list (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
- add_to_list ((LIST **) data, buf->data);
+ add_to_list ((string_list_t **) data, buf->data);
}
while (MoreArgs (s));
}
}
-static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_alternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
return 0;
}
-static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&Alternates, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
return -1;
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
if (data == M_SPAM)
- strfcpy (err->data, _("spam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("spam: no matching pattern"));
else
- strfcpy (err->data, _("nospam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("nospam: no matching pattern"));
return -1;
}
/* nospam only ever has one parameter. */
/* "*" is a special case. */
- if (!str_cmp (buf->data, "*")) {
+ if (!m_strcmp(buf->data, "*")) {
mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, (list_del_t*) rx_free);
+ list_del (&NoSpamList, (list_del_t*) rx_delete);
return 0;
}
}
/* This should not happen. */
- strfcpy (err->data, "This is no good at all.", err->dsize);
+ m_strcpy(err->data, err->dsize, "This is no good at all.");
return -1;
}
static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
/*
* Check for deletion of entire list
*/
- if (str_cmp (buf->data, "*") == 0) {
- mutt_free_list ((LIST **) data);
+ if (m_strcmp(buf->data, "*") == 0) {
+ string_list_wipe((string_list_t **) data);
break;
}
- remove_from_list ((LIST **) data, buf->data);
+ remove_from_list ((string_list_t **) data, buf->data);
}
while (MoreArgs (s));
return 0;
}
-static int parse_lists (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_lists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
do {
}
}
-static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
- BUFFER *err) {
+static int parse_attach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
+ BUFFER *err __attribute__ ((unused))) {
ATTACH_MATCH *a;
- LIST *listp, *lastp;
+ string_list_t *listp, *lastp;
char *p;
char *tmpminor;
int len;
/* Find the last item in the list that data points to. */
lastp = NULL;
- debug_print (5, ("parse_attach_list: ldata = %p, *ldata = %p\n",
- ldata, *ldata));
for (listp = *ldata; listp; listp = listp->next) {
a = (ATTACH_MATCH *)listp->data;
- debug_print (5, ("parse_attach_list: skipping %s/%s\n", a->major, a->minor));
lastp = listp;
}
a = p_new(ATTACH_MATCH, 1);
/* some cheap hacks that I expect to remove */
- if (!str_casecmp(buf->data, "any"))
+ if (!m_strcasecmp(buf->data, "any"))
a->major = m_strdup("*/.*");
- else if (!str_casecmp(buf->data, "none"))
+ else if (!m_strcasecmp(buf->data, "none"))
a->major = m_strdup("cheap_hack/this_should_never_match");
else
a->major = m_strdup(buf->data);
p_delete(&tmpminor);
- debug_print (5, ("parse_attach_list: added %s/%s [%d]\n",
- a->major, a->minor, a->major_int));
-
- listp = p_new(LIST, 1);
+ listp = p_new(string_list_t, 1);
listp->data = (char *)a;
listp->next = NULL;
if (lastp) {
return 0;
}
-static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err) {
+static int parse_unattach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
+ BUFFER *err __attribute__ ((unused))) {
ATTACH_MATCH *a;
- LIST *lp, *lastp, *newlp;
+ string_list_t *lp, *lastp, *newlp;
char *tmp;
int major;
char *minor;
do {
mutt_extract_token (buf, s, 0);
- if (!str_casecmp(buf->data, "any"))
+ if (!m_strcasecmp(buf->data, "any"))
tmp = m_strdup("*/.*");
- else if (!str_casecmp(buf->data, "none"))
+ else if (!m_strcasecmp(buf->data, "none"))
tmp = m_strdup("cheap_hack/this_should_never_match");
else
tmp = m_strdup(buf->data);
*minor = '\0';
++minor;
} else {
- minor = "unknown";
+ minor = m_strdup("unknown");
}
major = mutt_check_mime_type(tmp);
/* We must do our own walk here because remove_from_list() will only
- * remove the LIST->data, not anything pointed to by the LIST->data. */
+ * remove the string_list_t->data, not anything pointed to by the string_list_t->data. */
lastp = NULL;
for(lp = *ldata; lp; ) {
a = (ATTACH_MATCH *)lp->data;
- debug_print(5, ("parse_unattach_list: check %s/%s [%d] : %s/%s [%d]\n",
- a->major, a->minor, a->major_int, tmp, minor, major));
- if (a->major_int == major && !str_casecmp(minor, a->minor)) {
- debug_print(5, ("parse_unattach_list: removed %s/%s [%d]\n",
- a->major, a->minor, a->major_int));
+ if (a->major_int == major && !m_strcasecmp(minor, a->minor)) {
regfree(&a->minor_rx);
p_delete(&a->major);
return 0;
}
-static int print_attach_list (LIST *lp, char op, const char *name) {
+static int print_attach_list (string_list_t *lp, char op, const char *name) {
while (lp) {
printf("attachments %c%s %s/%s\n", op, name,
((ATTACH_MATCH *)lp->data)->major,
return 0;
}
-static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_attachments (BUFFER *buf, BUFFER *s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER *err) {
char op, *category;
- LIST **listp;
+ string_list_t **listp;
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
- strfcpy(err->data, _("attachments: no disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("attachments: no disposition"));
return -1;
}
op = '+';
category--;
}
- if (!str_ncasecmp(category, "attachment", strlen(category))) {
+ if (!m_strncasecmp(category, "attachment", strlen(category))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!str_ncasecmp(category, "inline", strlen(category))) {
+ else if (!m_strncasecmp(category, "inline", strlen(category))) {
if (op == '+')
listp = &InlineAllow;
else
listp = &InlineExclude;
} else {
- strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("attachments: invalid disposition"));
return -1;
}
return parse_attach_list(buf, s, listp, err);
}
-static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __attribute__ ((unused)), BUFFER *err) {
char op, *p;
- LIST **listp;
+ string_list_t **listp;
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
- strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("unattachments: no disposition"));
return -1;
}
op = '+';
p--;
}
- if (!str_ncasecmp(p, "attachment", strlen(p))) {
+ if (!m_strncasecmp(p, "attachment", strlen(p))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!str_ncasecmp(p, "inline", strlen(p))) {
+ else if (!m_strncasecmp(p, "inline", strlen(p))) {
if (op == '+')
listp = &InlineAllow;
else
listp = &InlineExclude;
}
else {
- strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition"));
return -1;
}
return parse_unattach_list(buf, s, listp, err);
}
-static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unlists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
remove_from_rx_list (&MailLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
return 0;
}
-static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
do {
return 0;
}
-static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unsubscribe (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
return 0;
}
-static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- ALIAS *tmp, *last = NULL;
+ alias_t *tmp, *last = NULL;
do {
mutt_extract_token (buf, s, 0);
- if (str_cmp ("*", buf->data) == 0) {
+ if (m_strcmp("*", buf->data) == 0) {
if (CurrentMenu == MENU_ALIAS) {
for (tmp = Aliases; tmp; tmp = tmp->next)
tmp->del = 1;
set_option (OPTFORCEREDRAWINDEX);
}
else
- mutt_free_alias (&Aliases);
+ alias_list_wipe(&Aliases);
break;
}
else
for (tmp = Aliases; tmp; tmp = tmp->next) {
- if (str_casecmp (buf->data, tmp->name) == 0) {
+ if (m_strcasecmp(buf->data, tmp->name) == 0) {
if (CurrentMenu == MENU_ALIAS) {
tmp->del = 1;
set_option (OPTFORCEREDRAWINDEX);
else
Aliases = tmp->next;
tmp->next = NULL;
- mutt_free_alias (&tmp);
+ alias_list_wipe(&tmp);
break;
}
last = tmp;
return 0;
}
-static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_alias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- ALIAS *tmp = Aliases;
- ALIAS *last = NULL;
- char *estr = NULL;
+ alias_t *tmp = Aliases;
+ alias_t *last = NULL;
+ const char *estr = NULL;
if (!MoreArgs (s)) {
- strfcpy (err->data, _("alias: no address"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("alias: no address"));
return (-1);
}
mutt_extract_token (buf, s, 0);
- debug_print (2, ("first token is '%s'.\n", buf->data));
-
/* check to see if an alias with this name already exists */
for (; tmp; tmp = tmp->next) {
- if (!str_casecmp (tmp->name, buf->data))
+ if (!m_strcasecmp(tmp->name, buf->data))
break;
last = tmp;
}
if (!tmp) {
/* create a new alias */
- tmp = p_new(ALIAS, 1);
- tmp->self = tmp;
+ tmp = alias_new();
tmp->name = m_strdup(buf->data);
/* give the main addressbook code a chance */
if (CurrentMenu == MENU_ALIAS)
}
else {
/* override the previous value */
- rfc822_free_address (&tmp->addr);
+ address_list_wipe(&tmp->addr);
if (CurrentMenu == MENU_ALIAS)
set_option (OPTFORCEREDRAWINDEX);
}
mutt_extract_token (buf, s,
M_TOKEN_QUOTE | M_TOKEN_SPACE | M_TOKEN_SEMICOLON);
- debug_print (2, ("second token is '%s'.\n", buf->data));
tmp->addr = mutt_parse_adrlist (tmp->addr, buf->data);
if (last)
last->next = tmp;
_("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name);
return -1;
}
-#ifdef DEBUG
- if (DebugLevel >= 2) {
- ADDRESS *a;
- /* A group is terminated with an empty address, so check a->mailbox */
- for (a = tmp->addr; a && a->mailbox; a = a->next) {
- if (!a->group)
- debug_print (2, ("%s\n", a->mailbox));
- else
- debug_print (2, ("group %s\n", a->mailbox));
- }
- }
-#endif
return 0;
}
static int
-parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
+parse_unmy_hdr (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- LIST *last = NULL;
- LIST *tmp = UserHeader;
- LIST *ptr;
- size_t l;
+ string_list_t *last = NULL;
+ string_list_t *tmp = UserHeader;
+ string_list_t *ptr;
+ ssize_t l;
do {
mutt_extract_token (buf, s, 0);
- if (str_cmp ("*", buf->data) == 0)
- mutt_free_list (&UserHeader);
+ if (m_strcmp("*", buf->data) == 0)
+ string_list_wipe(&UserHeader);
else {
tmp = UserHeader;
last = NULL;
UserHeader = tmp->next;
tmp = tmp->next;
ptr->next = NULL;
- mutt_free_list (&ptr);
+ string_list_wipe(&ptr);
}
else {
last = tmp;
return 0;
}
-static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- LIST *tmp;
- size_t keylen;
+ string_list_t *tmp;
+ ssize_t keylen;
char *p;
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
- strfcpy (err->data, _("invalid header field"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("invalid header field"));
return (-1);
}
keylen = p - buf->data + 1;
if (!tmp->next)
break;
}
- tmp->next = mutt_new_list ();
+ tmp->next = string_item_new();
tmp = tmp->next;
}
else {
- tmp = mutt_new_list ();
+ tmp = string_item_new();
UserHeader = tmp;
}
tmp->data = buf->data;
static int
parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int i, flags = 0;
- if (str_ncmp ("reverse-", s, 8) == 0) {
+ if (m_strncmp("reverse-", s, 8) == 0) {
s += 8;
flags = SORT_REVERSE;
}
- if (str_ncmp ("last-", s, 5) == 0) {
+ if (m_strncmp("last-", s, 5) == 0) {
s += 5;
flags |= SORT_LAST;
}
}
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_set_default(const char *name, void* p, unsigned long more)
+static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, unsigned long more)
{
char buf[LONG_STRING];
struct option_t *ptr = p;
short type, short dodup) {
struct option_t* option = p_new(struct option_t, 1);
- debug_print (1, ("adding $%s\n", name));
-
option->option = m_strdup(name);
option->type = type;
if (init)
/* free()'s option_t* */
static void del_option (void* p) {
- struct option_t* ptr = (struct option_t*) p;
+ struct option_t *ptr = (struct option_t*) p;
char* s = (char*) ptr->data;
- debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
p_delete(&ptr->option);
p_delete(&s);
p_delete(&ptr->init);
static int init_expand (char** dst, struct option_t* src) {
BUFFER token, in;
- size_t len = 0;
+ ssize_t len = 0;
p_delete(dst);
}
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_restore_default (const char* name, void* p,
- unsigned long more) {
+static void mutt_restore_default (const char* name __attribute__ ((unused)),
+ void* p, unsigned long more) {
char errbuf[STRING];
struct option_t* ptr = (struct option_t*) p;
char* init = NULL;
}
/* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p,
+ char* errbuf, ssize_t errlen) {
char* val = (char*) p;
- if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
- str_ncmp (val, "full", 4) != 0) {
+ if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
+ m_strncmp(val, "full", 4) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
return (0);
/* check whether value for $dsn_notify would be valid */
static int check_dsn_notify (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
list2_t* list = NULL;
- int i = 0, rc = 1;
+ ssize_t i = 0;
+ int rc = 1;
char* val = (char*) p;
if (!val || !*val)
return (1);
for (i = 0; i < list->length; i++)
- if (str_ncmp (list->data[i], "never", 5) != 0 &&
- str_ncmp (list->data[i], "failure", 7) != 0 &&
- str_ncmp (list->data[i], "delay", 5) != 0 &&
- str_ncmp (list->data[i], "success", 7) != 0) {
+ if (m_strncmp(list->data[i], "never", 5) != 0 &&
+ m_strncmp(list->data[i], "failure", 7) != 0 &&
+ m_strncmp(list->data[i], "delay", 5) != 0 &&
+ m_strncmp(list->data[i], "success", 7) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
(char*) list->data[i], "dsn_notify");
}
static int check_num (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
if ((int) p < 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
return (1);
}
-#ifdef DEBUG
-static int check_debug (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
- if ((int) p <= DEBUG_MAX_LEVEL &&
- (int) p >= DEBUG_MIN_LEVEL)
- return (1);
-
- if (errbuf)
- snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
- return (0);
-}
-#endif
-
-static int check_history (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
+ char* errbuf, ssize_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
return (0);
mutt_init_history ();
}
static int check_special (const char* name, unsigned long val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int i = 0;
for (i = 0; SpecialVars[i].name; i++) {
- if (str_cmp (SpecialVars[i].name, name) == 0) {
+ if (m_strcmp(SpecialVars[i].name, name) == 0) {
return (SpecialVars[i].check (SpecialVars[i].name,
val, errbuf, errlen));
}
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
+ map = SortKeyMethods;
break;
case DT_SORT_AUX:
map = SortAuxMethods;
query = 1;
s->dptr++;
}
- else if (str_ncmp ("no", s->dptr, 2) == 0) {
+ else if (m_strncmp("no", s->dptr, 2) == 0) {
s->dptr += 2;
unset = !unset;
}
- else if (str_ncmp ("inv", s->dptr, 3) == 0) {
+ else if (m_strncmp("inv", s->dptr, 3) == 0) {
s->dptr += 3;
inv = !inv;
}
/* there's no option named like this yet so only add one
* if the action isn't any of: reset, unset, query */
if (!(reset || unset || query || *s->dptr != '=')) {
- debug_print (1, ("adding user option '%s'\n", tmp->data));
option = add_user_option (tmp->data);
hash_insert (ConfigOptions, option->option, option, 0);
}
}
- if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
+ if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
}
- SKIPWS (s->dptr);
+ s->dptr = vskipspaces(s->dptr);
if (reset) {
if (query || unset || inv) {
return (-1);
}
- if (!str_cmp ("all", tmp->data)) {
+ if (!m_strcmp("all", tmp->data)) {
if (CurrentMenu == MENU_PAGER) {
snprintf (err->data, err->dsize, _("Not available in this menu."));
return (-1);
r = -1;
break;
} else if (DTYPE (option->type) == DT_ADDR)
- rfc822_free_address ((ADDRESS **) option->data);
+ address_list_wipe((address_t **) option->data);
else if (DTYPE (option->type) == DT_USER)
/* to unset $user_ means remove */
hash_delete (ConfigOptions, option->option,
option, del_option);
else
- p_delete((void **)&option->data);
+ p_delete((void **)(void *)&option->data);
break;
}
}
break;
}
- /* the $muttng_ variables are read-only */
+ /* the $madmutt_ variables are read-only */
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
BUFFER token;
char *linebuf = NULL;
char *currentline = NULL;
- size_t buflen;
+ ssize_t buflen;
pid_t pid;
- debug_print (2, ("reading configuration file '%s'.\n", rcfile));
-
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
return (-1);
}
p_clear(&token, 1);
- while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
+ while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
currentline = m_strdup(linebuf);
#undef MAXERRS
-static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
+static int parse_source (BUFFER * tmp, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
char path[_POSIX_PATH_MAX];
return (-1);
}
- strfcpy (path, tmp->data, sizeof(path));
+ m_strcpy(path, sizeof(path), tmp->data);
mutt_expand_path (path, sizeof(path));
rc += source_rc (path, err);
*err->data = 0;
- debug_print (1, ("expand '%s'\n", line));
-
- SKIPWS (expn.dptr);
+ expn.dptr = vskipspaces(expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')
break; /* rest of line is a comment */
}
mutt_extract_token (token, &expn, 0);
for (i = 0; Commands[i].name; i++) {
- if (!str_cmp (token->data, Commands[i].name)) {
+ if (!m_strcmp(token->data, Commands[i].name)) {
if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
goto finish;
break;
if (strstr (src, try) == src) {
Matches[Num_matched++] = src;
if (dest[0] == 0)
- strfcpy (dest, src, len);
+ m_strcpy(dest, len, src);
else {
for (l = 0; src[l] && src[l] == dest[l]; l++);
dest[l] = 0;
}
}
-int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
+int mutt_command_complete (char *buffer, ssize_t len, int pos, int numtabs)
{
char *pt = buffer;
int num;
int spaces; /* keep track of the number of leading spaces on the line */
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
- p_clear(Matches, sizeof(Matches));
- p_clear(Completed, sizeof(Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
sizeof(Completed));
Matches[(numtabs - 2) % Num_matched]);
/* return the completed command */
- strncpy (buffer, Completed, len - spaces);
+ m_strcpy(buffer, len - spaces, Completed);
}
- else if (!str_ncmp (buffer, "set", 3)
- || !str_ncmp (buffer, "unset", 5)
- || !str_ncmp (buffer, "reset", 5)
- || !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
+ else if (!m_strncmp(buffer, "set", 3)
+ || !m_strncmp(buffer, "unset", 5)
+ || !m_strncmp(buffer, "reset", 5)
+ || !m_strncmp(buffer, "toggle", 6)) { /* complete variables */
const char *prefixes[] = { "no", "inv", "?", "&", NULL };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
- if (!str_ncmp (buffer, "set", 3)) {
+ if (!m_strncmp(buffer, "set", 3)) {
for (num = 0; prefixes[num]; num++) {
- if (!str_ncmp (pt, prefixes[num], m_strlen(prefixes[num]))) {
+ if (!m_strncmp(pt, prefixes[num], m_strlen(prefixes[num]))) {
pt += m_strlen(prefixes[num]);
break;
}
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
- p_clear(Matches, sizeof(Matches));
- p_clear(Completed, sizeof(Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; MuttVars[num].option; num++)
candidate(Completed, User_typed, MuttVars[num].option,
sizeof(Completed));
snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
- else if (!str_ncmp (buffer, "exec", 4)) {
+ else if (!m_strncmp(buffer, "exec", 4)) {
struct binding_t *menu = km_get_table (CurrentMenu);
if (!menu && CurrentMenu != MENU_PAGER)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
- p_clear(Matches, sizeof(Matches));
- p_clear(Completed, sizeof(Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
else
return 0;
return 1;
}
-int mutt_var_value_complete (char *buffer, size_t len, int pos)
+int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
{
char var[STRING], *pt = buffer;
int spaces;
if (buffer[0] == 0)
return 0;
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
if (*pt == '=') /* abort if no var before the '=' */
return 0;
- if (str_ncmp (buffer, "set", 3) == 0) {
- strfcpy (var, pt, sizeof(var));
+ if (m_strncmp(buffer, "set", 3) == 0) {
+ m_strcpy(var, sizeof(var), pt);
/* ignore the trailing '=' when comparing */
var[m_strlen(var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
else {
char tmp[LONG_STRING], tmp2[LONG_STRING];
char *s, *d;
- size_t dlen = buffer + len - pt - spaces;
+ ssize_t dlen = buffer + len - pt - spaces;
const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
tmp[0] = '\0';
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
- strfcpy (tmp, NONULL (*((char **) option->data)), sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(*((char **)option->data)));
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
rfc822_write_address (tmp, sizeof(tmp),
- *((ADDRESS **) option->data), 0);
+ *((address_t **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
- strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
else if (DTYPE (option->type) == DT_NUM)
snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
else if (DTYPE (option->type) == DT_SORT) {
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
- else
- map = SortMethods;
+ map = SortKeyMethods;
break;
default:
map = SortMethods;
default:
p = "unknown";
}
- strfcpy (tmp, p, sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
}
else if (DTYPE (option->type) == DT_BOOL)
- strfcpy (tmp, option (option->data) ? "yes" : "no",
- sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
else
return 0;
- for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof(tmp2) - 2;) {
+ for (s = tmp, d = tmp2; *s && (d - tmp2) < ssizeof(tmp2) - 2;) {
if (*s == '\\' || *s == '"')
*d++ = '\\';
*d++ = *s++;
}
*d = '\0';
- strfcpy (tmp, pt, sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), pt);
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
}
/* Implement the -Q command line flag */
-int mutt_query_variables (LIST * queries)
+int mutt_query_variables (string_list_t * queries)
{
- LIST *p;
+ string_list_t *p;
char errbuff[STRING];
char command[STRING];
return 0;
}
-const char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (map[i].value == val)
- return (map[i].name);
- return NULL;
-}
-
-int mutt_getvaluebyname (const char *name, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (ascii_strcasecmp (map[i].name, name) == 0)
- return (map[i].value);
- return (-1);
-}
-
-static int mutt_execute_commands (LIST * p)
+static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
char errstr[SHORT_STRING];
return 0;
}
-void mutt_init (int skip_sys_rc, LIST * commands)
+void mutt_init (int skip_sys_rc, string_list_t * commands)
{
struct passwd *pw;
struct utsname utsname;
const char *p;
char buffer[STRING], error[STRING];
- int i, default_rc = 0, need_pause = 0;
+ int default_rc = 0, need_pause = 0;
+ unsigned int i;
BUFFER err;
p_clear(&err, 1);
if (!Homedir)
Homedir = m_strdup(pw->pw_dir);
- Realname = m_strdup(mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+ Realname = m_strdup(rnbuf);
Shell = m_strdup(pw->pw_shell);
endpwent ();
}
Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh");
}
- debug_start(Homedir);
-
/* And about the host... */
uname (&utsname);
/* some systems report the FQDN instead of just the hostname */
if ((p = strchr (utsname.nodename, '.'))) {
- Hostname = str_substrdup (utsname.nodename, p);
+ Hostname = p_dupstr(utsname.nodename, p - utsname.nodename);
p++;
- strfcpy (buffer, p, sizeof(buffer)); /* save the domain for below */
+ m_strcpy(buffer, sizeof(buffer), p); /* save the domain for below */
}
else
Hostname = m_strdup(utsname.nodename);
-#ifndef DOMAIN
-#define DOMAIN buffer
- if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
+ if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1)
Fqdn = m_strdup("@");
else
-#endif /* DOMAIN */
- if (*DOMAIN != '@') {
- Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+ if (*buffer != '@') {
+ Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
}
else
Fqdn = m_strdup(NONULL (Hostname));
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
fgets (buffer, sizeof(buffer), f);
- p = buffer;
- SKIPWS (p);
+ p = vskipspaces(buffer);
q = (char*)p;
while (*q && !isspace(*q))
q++;
Spoolfile = m_strdup(p);
else {
#ifdef HOMESPOOL
- mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
#else
- mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
+ mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
#endif
Spoolfile = m_strdup(buffer);
}
p = "vi";
}
Editor = m_strdup(p);
- Visual = m_strdup(p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
if ((p = getenv ("EMAIL")) != NULL)
From = rfc822_parse_adrlist (NULL, p);
- mutt_set_langinfo_charset ();
- mutt_set_charset (Charset);
-
+ charset_initialize();
/* Set standard defaults */
hash_map (ConfigOptions, mutt_set_default, 0);
CurrentMenu = MENU_MAIN;
-
-#ifndef LOCALES_HACK
/* Do we have a locale definition? */
if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
((p = getenv ("LANG")) != NULL && p[0]) ||
((p = getenv ("LC_CTYPE")) != NULL && p[0]))
set_option (OPTLOCALES);
-#endif
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
if (!Muttrc) {
#if 0
- snprintf (buffer, sizeof(buffer), "%s/.muttngrc-%s", NONULL (Homedir),
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof(buffer), "%s/.muttngrc", NONULL (Homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
#if 0
- snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc-%s",
+ snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc",
+ snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
NONULL (Homedir));
default_rc = 1;
Muttrc = m_strdup(buffer);
}
else {
- strfcpy (buffer, Muttrc, sizeof(buffer));
+ m_strcpy(buffer, sizeof(buffer), Muttrc);
p_delete(&Muttrc);
mutt_expand_path (buffer, sizeof(buffer));
Muttrc = m_strdup(buffer);
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
- snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", SYSCONFDIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", SYSCONFDIR);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", PKGDATADIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/Muttngrc", PKGDATADIR);
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
/* warn about synonym variables */
if (!list_empty(Synonyms)) {
- int i = 0;
+ i = 0;
fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
for (i = 0; i < Synonyms->length; i++) {
struct option_t* newopt = NULL, *oldopt = NULL;
/* compare two option_t*'s for sorting -t/-T output */
static int opt_cmp (const void* a, const void* b) {
- return (str_cmp ((*(struct option_t**) a)->option,
+ return (m_strcmp((*(struct option_t**) a)->option,
(*(struct option_t**) b)->option));
}
/* callback for hash_map() to put all non-synonym vars into list */
-static void opt_sel_full (const char* key, void* data,
+static void opt_sel_full (const char* key __attribute__ ((unused)),
+ void* data,
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
}
/* callback for hash_map() to put all changed non-synonym vars into list */
-static void opt_sel_diff (const char* key, void* data,
+static void opt_sel_diff (const char* key __attribute__ ((unused)),
+ void* data,
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
return;
mutt_option_value (option->option, buf, sizeof(buf));
- if (str_cmp (buf, option->init) != 0)
+ if (m_strcmp(buf, option->init) != 0)
list_push_back (l, option);
}
/* dump out the value of all the variables we have */
int mutt_dump_variables (int full) {
- int i = 0;
+ ssize_t i = 0;
char outbuf[STRING];
list2_t* tmp = NULL;
struct option_t* option = NULL;