X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=init.c;h=9d6908b79643d100be732f1e9371140b2dbd9959;hb=717c9f150ded0fed572d27f68db07f94a9fe70e8;hp=96fcf0bc519903f8ca0963dc7959ccebd5c29688;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded;p=apps%2Fmadmutt.git diff --git a/init.c b/init.c index 96fcf0b..9d6908b 100644 --- a/init.c +++ b/init.c @@ -11,7 +11,6 @@ */ #include -#include #include #include @@ -69,10 +68,6 @@ static const char* CurRCFile = NULL; static int CurRCLine = 0; /* prototypes for checking for special vars */ -static int check_dsn_return (const char* option, unsigned long val, - char* errbuf, ssize_t errlen); -static int check_dsn_notify (const char* option, unsigned long val, - char* errbuf, ssize_t errlen); static int check_history (const char* option, unsigned long val, char* errbuf, ssize_t errlen); /* this checks that numbers are >= 0 */ @@ -92,8 +87,6 @@ static struct { int (*check) (const char* option, unsigned long val, char* errbuf, ssize_t errlen); } SpecialVars[] = { - { "dsn_notify", check_dsn_notify }, - { "dsn_return", check_dsn_return }, #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS)) { "smtp_use_tls", mutt_libesmtp_check_usetls }, #endif @@ -564,52 +557,6 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err) return 0; } -static int add_to_spam_list(rx_t **list, const char *pat, - const char *templ, BUFFER * err) -{ - rx_t *rx; - - if (m_strisempty(pat) || !templ) - return 0; - - if (!(rx = rx_compile (pat, REG_ICASE))) { - snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat); - return -1; - } - - /* check to make sure the item is not already on this list */ - while (*list) { - if (!ascii_strcasecmp(rx->pattern, (*list)->pattern)) { - rx_t *tmp = rx_list_pop(list); - rx_delete(&tmp); - } else { - list = &(*list)->next; - } - } - - *list = rx; - rx_set_template(rx, templ); - return 0; -} - -static int remove_from_spam_list (rx_t ** list, const char *pat) -{ - int nremoved = 0; - - while (*list) { - if (!m_strcmp((*list)->pattern, pat)) { - rx_t *spam = rx_list_pop(list); - rx_delete(&spam); - nremoved++; - } else { - list = &(*list)->next; - } - } - - return nremoved; -} - - static void remove_from_list(string_list_t **l, const char *str) { if (!m_strcmp("*", str)) { @@ -635,7 +582,7 @@ static int remove_from_rx_list(rx_t **l, const char *str) } l = rx_lookup(l, str); - if (l) { + if (*l) { rx_t *r = rx_list_pop(l); rx_delete(&r); return 0; @@ -729,74 +676,6 @@ static int parse_unalternates (BUFFER * buf, BUFFER * s, return 0; } -static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) -{ - BUFFER templ; - - p_clear(&templ, 1); - - /* Insist on at least one parameter */ - if (!MoreArgs (s)) { - if (data == M_SPAM) - m_strcpy(err->data, err->dsize, _("spam: no matching pattern")); - else - m_strcpy(err->data, err->dsize, _("nospam: no matching pattern")); - return -1; - } - - /* Extract the first token, a regexp */ - mutt_extract_token (buf, s, 0); - - /* data should be either M_SPAM or M_NOSPAM. M_SPAM is for spam commands. */ - if (data == M_SPAM) { - /* If there's a second parameter, it's a template for the spam tag. */ - if (MoreArgs (s)) { - mutt_extract_token (&templ, s, 0); - - /* Add to the spam list. */ - if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) { - p_delete(&templ.data); - return -1; - } - p_delete(&templ.data); - } - - /* If not, try to remove from the nospam list. */ - else { - remove_from_rx_list (&NoSpamList, buf->data); - } - - return 0; - } - - /* M_NOSPAM is for nospam commands. */ - else if (data == M_NOSPAM) { - /* nospam only ever has one parameter. */ - - /* "*" is a special case. */ - if (!m_strcmp(buf->data, "*")) { - rx_list_wipe(&SpamList); - rx_list_wipe(&NoSpamList); - return 0; - } - - /* If it's on the spam list, just remove it. */ - if (remove_from_spam_list (&SpamList, buf->data) != 0) - return 0; - - /* Otherwise, add it to the nospam list. */ - if (add_to_rx_list (&NoSpamList, buf->data, REG_ICASE, err) != 0) - return -1; - - return 0; - } - - /* This should not happen. */ - 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 __attribute__ ((unused))) { @@ -1394,45 +1273,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)), set_option (OPTREDRAWTREE); } -/* check whether value for $dsn_return would be valid */ -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 && 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); - } - return (1); -} - -/* check whether value for $dsn_notify would be valid */ -static int -check_dsn_notify (const char* option __attribute__ ((unused)), - unsigned long val, char* errbuf, ssize_t errlen) -{ - const char *p = (const char*)val; - - while (p && *p) { - const char *q = m_strchrnul(p, ','); - int len = q - p; - - if (!m_strncmp(p, "never", len) && !m_strncmp(p, "delay", len) - && !m_strncmp(p, "failure", len) && !m_strncmp(p, "success", len)) - { - if (errbuf) - snprintf(errbuf, errlen, _("'%.*s' is invalid for $%s"), - len, p, "dsn_notify"); - return 0; - } - - p = q + 1; - } - - return 1; -} - static int check_num (const char* option, unsigned long p, char* errbuf, ssize_t errlen) { if ((int) p < 0) { @@ -1727,12 +1567,12 @@ static int source_rc (const char *rcfile, BUFFER * err) p_clear(&token, 1); while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) { - conv = ConfigCharset && (*ConfigCharset) && Charset; + conv = ConfigCharset && (*ConfigCharset) && MCharset.charset; if (conv) { currentline = m_strdup(linebuf); if (!currentline) continue; - mutt_convert_string (¤tline, ConfigCharset, Charset, 0); + mutt_convert_string (¤tline, ConfigCharset, MCharset.charset, 0); } else currentline = linebuf; @@ -2187,7 +2027,6 @@ static int mutt_execute_commands (string_list_t * p) 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 default_rc = 0, need_pause = 0; @@ -2209,34 +2048,13 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) snprintf (AttachmentMarker, sizeof(AttachmentMarker), "\033]9;%ld\a", (long) time (NULL)); + luaM_initialize(); /* Get some information about the user */ if ((pw = getpwuid (getuid ()))) { char rnbuf[STRING]; - mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx); + mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask); Realname = m_strdup(rnbuf); - endpwent (); - } - - /* And about the host... */ - uname (&utsname); - /* some systems report the FQDN instead of just the hostname */ - if ((p = strchr (utsname.nodename, '.'))) { - Hostname = p_dupstr(utsname.nodename, p - utsname.nodename); - p++; - m_strcpy(buffer, sizeof(buffer), p); /* save the domain for below */ - } - else - Hostname = m_strdup(utsname.nodename); - - if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1) - Fqdn = m_strdup("@"); - else - if (*buffer != '@') { - Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2); - sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); } - else - Fqdn = m_strdup(NONULL (Hostname)); #ifdef USE_NNTP { @@ -2259,11 +2077,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) NewsServer = m_strdup(p); #endif - if ((p = getenv ("MAIL"))) + if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) { Spoolfile = m_strdup(p); - else if ((p = getenv ("MAILDIR"))) - Spoolfile = m_strdup(p); - else { + } else { #ifdef HOMESPOOL mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH); #else @@ -2298,9 +2114,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) if ((p = getenv ("EMAIL")) != NULL) From = rfc822_parse_adrlist (NULL, p); - charset_initialize(); - luaM_initialize(); - /* Set standard defaults */ hash_map (ConfigOptions, mutt_set_default, 0); hash_map (ConfigOptions, mutt_restore_default, 0); @@ -2330,8 +2143,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) mutt_expand_path (buffer, sizeof(buffer)); Muttrc = m_strdup(buffer); } - p_delete(&AliasFile); - AliasFile = m_strdup(NONULL (Muttrc)); /* Process the global rc file if it exists and the user hasn't explicity requested not to via "-n". */