* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#include <lib-lib/lib-lib.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/debug.h>
-#include <lib-lib/rx.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_ssl.h>
/* this checks that numbers are >= 0 */
static int check_num (const char* option, unsigned long val,
char* errbuf, ssize_t errlen);
-#ifdef DEBUG
-static int check_debug (const char* option, unsigned long val,
- char* errbuf, ssize_t errlen);
-#endif
/* use this to check only */
static int check_special (const char* option, unsigned long val,
#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
-#ifdef DEBUG
- { "debug_level", check_debug },
-#endif
/* last */
{ NULL, NULL }
};
int clean = 0;
/* get some $madmutt_ values dynamically */
- if (ascii_strcmp ("madmutt_pwd", option->option) == 0) {
+ if (m_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 ("madmutt_folder_path", option->option) == 0 &&
+ } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
- } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 &&
+ } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
ssize_t Maildirlength = m_strlen(Maildir);
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);
}
p_delete(p);
}
-void toggle_quadoption (int opt)
+static void toggle_quadoption (int opt)
{
int n = opt / 4;
int b = (opt % 4) * 2;
}
}
-static int add_to_rx_list (list2_t** list, const char *s, int flags,
- BUFFER * err)
+static int
+add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
{
- rx_t* rx;
- int i = 0;
+ rx_t* rx;
- if (!s || !*s)
- return 0;
+ if (!s || !*s)
+ return 0;
- if (!(rx = rx_compile (s, flags))) {
- snprintf (err->data, err->dsize, "Bad regexp: %s\n", s);
- return -1;
- }
+ if (rx_lookup(list, s))
+ return 0;
- i = rx_lookup ((*list), rx->pattern);
- if (i >= 0)
- rx_delete(&rx);
- else
- list_push_back (list, rx);
- return 0;
+ rx = rx_compile(s, flags);
+ if (!rx) {
+ snprintf(err->data, err->dsize, "Bad regexp: %s\n", s);
+ return -1;
+ }
+
+ rx_list_append(list, rx);
+ return 0;
}
static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
}
}
-static int remove_from_rx_list (list2_t** l, const char *str)
+static int remove_from_rx_list(rx_t **l, const char *str)
{
- int i = 0;
+ if (m_strcmp("*", str) == 0) {
+ rx_list_wipe(l);
+ return 0;
+ }
- 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_delete(&r);
- return (0);
+ l = rx_lookup(l, str);
+ if (l) {
+ rx_t *r = rx_list_pop(l);
+ rx_delete(&r);
+ return 0;
}
- }
- return (-1);
+
+ return -1;
}
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
/* "*" is a special case. */
if (!m_strcmp(buf->data, "*")) {
mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, (list_del_t*) rx_delete);
+ rx_list_wipe(&NoSpamList);
return 0;
}
/* 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;
}
p_delete(&tmpminor);
- debug_print (5, ("parse_attach_list: added %s/%s [%d]\n",
- a->major, a->minor, a->major_int));
-
listp = p_new(string_list_t, 1);
listp->data = (char *)a;
listp->next = NULL;
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 && !m_strcasecmp(minor, a->minor)) {
- debug_print(5, ("parse_unattach_list: removed %s/%s [%d]\n",
- a->major, a->minor, a->major_int));
regfree(&a->minor_rx);
p_delete(&a->major);
{
alias_t *tmp = Aliases;
alias_t *last = NULL;
- const char *estr = NULL;
+ char *estr = NULL;
if (!MoreArgs (s)) {
m_strcpy(err->data, err->dsize, _("alias: no address"));
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 (!m_strcasecmp(tmp->name, buf->data))
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;
if (mutt_addrlist_to_idna (tmp->addr, &estr)) {
snprintf (err->data, err->dsize,
_("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name);
+ p_delete(&estr);
return -1;
}
-#ifdef DEBUG
- if (DebugLevel >= 2) {
- address_t *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;
}
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)
static void del_option (void* 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);
}
/* check whether value for $dsn_notify would be valid */
-static int check_dsn_notify (const char* option, unsigned long p,
+static int check_dsn_notify (const char* option __attribute__ ((unused)), unsigned long p,
char* errbuf, ssize_t errlen) {
list2_t* list = NULL;
ssize_t i = 0;
return (1);
}
-#ifdef DEBUG
-static int check_debug (const char* option, unsigned long p,
- char* errbuf, ssize_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 __attribute__ ((unused)), unsigned long p,
char* errbuf, ssize_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
}
/* see if we need to add $user_ var */
- if (!option && ascii_strncmp ("user_", tmp->data, 5) == 0) {
+ if (!option && m_strncmp("user_", tmp->data, 5) == 0) {
/* 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);
}
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);
*err->data = 0;
- debug_print (1, ("expand '%s'\n", line));
-
expn.dptr = vskipspaces(expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')
const char *p;
char buffer[STRING], error[STRING];
int default_rc = 0, need_pause = 0;
- unsigned int i;
+ int i;
BUFFER err;
p_clear(&err, 1);
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 = 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;
- /* 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);
-
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
if (getsid (0) == getpid ())
mutt_init_history ();
-
-
-
- /*
- *
- * BIG FAT WARNING
- *
- * When changing the code which looks for a configuration file,
- * please also change the corresponding code in muttbug.sh.in.
- *
- *
- */
-
-
-
-
if (!Muttrc) {
#if 0
snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),