#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "history.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
#include "mutt_ssl.h"
#endif
#include "mx.h"
#include "init.h"
-#include "mailbox.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
+#include "lib/list.h"
+#include "lib/debug.h"
#include <ctype.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/wait.h>
+/* for synonym warning reports: synonym found during parsing */
+typedef struct {
+ char* f; /* file */
+ int l; /* line */
+ int n; /* new name (index) */
+ int o; /* old name (index) */
+} syn_t;
+
+/* for synonym warning reports: list of synonyms found */
+list2_t* Synonyms;
+/* for synonym warning reports: current rc file */
+char* CurRCFile = NULL;
+/* for synonym warning reports: current rc line */
+int CurRCLine = 0;
+
+/* for synonym warning reports: adds synonym to end of list */
+static void syn_add (int n, int o) {
+ syn_t* tmp = mem_malloc (sizeof (syn_t));
+ tmp->f = str_dup (CurRCFile);
+ tmp->l = CurRCLine;
+ tmp->n = n;
+ tmp->o = o;
+ list_push_back (&Synonyms, tmp);
+}
+
+/* for synonym warning reports: free single item (for list_del()) */
+static void syn_del (void** p) {
+ mem_free(&(*(syn_t**) p)->f);
+ mem_free(p);
+}
+
void toggle_quadoption (int opt)
{
int n = opt / 4;
int i;
for (i = 0; MuttVars[i].option; i++)
- if (safe_strcmp (s, MuttVars[i].option) == 0)
+ if (str_cmp (s, MuttVars[i].option) == 0) {
+ if (MuttVars[i].type == DT_SYN)
+ syn_add (mutt_option_index ((char *) MuttVars[i].data), i);
return (MuttVars[i].type ==
DT_SYN ? mutt_option_index ((char *) MuttVars[i].data) : i);
- return (-1);
-}
-
-int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
-{
- char ch;
- char qc = 0; /* quote char */
- char *pc;
-
- /* reset the destination pointer to the beginning of the buffer */
- dest->dptr = dest->data;
-
- SKIPWS (tok->dptr);
- while ((ch = *tok->dptr)) {
- if (!qc) {
- if ((ISSPACE (ch) && !(flags & M_TOKEN_SPACE)) ||
- (ch == '#' && !(flags & M_TOKEN_COMMENT)) ||
- (ch == '=' && (flags & M_TOKEN_EQUAL)) ||
- (ch == ';' && !(flags & M_TOKEN_SEMICOLON)) ||
- ((flags & M_TOKEN_PATTERN) && strchr ("~!|", ch)))
- break;
- }
-
- tok->dptr++;
-
- if (ch == qc)
- qc = 0; /* end of quote */
- else if (!qc && (ch == '\'' || ch == '"') && !(flags & M_TOKEN_QUOTE))
- qc = ch;
- else if (ch == '\\' && qc != '\'') {
- if (!*tok->dptr)
- return -1; /* premature end of token */
- switch (ch = *tok->dptr++) {
- case 'c':
- case 'C':
- if (!*tok->dptr)
- return -1; /* premature end of token */
- mutt_buffer_addch (dest, (toupper ((unsigned char) *tok->dptr)
- - '@') & 0x7f);
- tok->dptr++;
- break;
- case 'r':
- mutt_buffer_addch (dest, '\r');
- break;
- case 'n':
- mutt_buffer_addch (dest, '\n');
- break;
- case 't':
- mutt_buffer_addch (dest, '\t');
- break;
- case 'f':
- mutt_buffer_addch (dest, '\f');
- break;
- case 'e':
- mutt_buffer_addch (dest, '\033');
- break;
- default:
- if (isdigit ((unsigned char) ch) &&
- isdigit ((unsigned char) *tok->dptr) &&
- isdigit ((unsigned char) *(tok->dptr + 1))) {
-
- mutt_buffer_addch (dest,
- (ch << 6) + (*tok->dptr << 3) + *(tok->dptr +
- 1) - 3504);
- tok->dptr += 2;
- }
- else
- mutt_buffer_addch (dest, ch);
- }
}
- else if (ch == '^' && (flags & M_TOKEN_CONDENSE)) {
- if (!*tok->dptr)
- return -1; /* premature end of token */
- ch = *tok->dptr++;
- if (ch == '^')
- mutt_buffer_addch (dest, ch);
- else if (ch == '[')
- mutt_buffer_addch (dest, '\033');
- else if (isalpha ((unsigned char) ch))
- mutt_buffer_addch (dest, toupper ((unsigned char) ch) - '@');
- else {
- mutt_buffer_addch (dest, '^');
- mutt_buffer_addch (dest, ch);
- }
- }
- else if (ch == '`' && (!qc || qc == '"')) {
- FILE *fp;
- pid_t pid;
- char *cmd, *ptr;
- size_t expnlen;
- BUFFER expn;
- int line = 0;
-
- pc = tok->dptr;
- do {
- if ((pc = strpbrk (pc, "\\`"))) {
- /* skip any quoted chars */
- if (*pc == '\\')
- pc += 2;
- }
- } while (pc && *pc != '`');
- if (!pc) {
- dprint (1, (debugfile, "mutt_get_token: mismatched backtics\n"));
- return (-1);
- }
- cmd = str_substrdup (tok->dptr, pc);
- if ((pid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
- dprint (1,
- (debugfile, "mutt_get_token: unable to fork command: %s",
- cmd));
- FREE (&cmd);
- return (-1);
- }
- FREE (&cmd);
-
- tok->dptr = pc + 1;
-
- /* read line */
- memset (&expn, 0, sizeof (expn));
- expn.data = mutt_read_line (NULL, &expn.dsize, fp, &line);
- fclose (fp);
- mutt_wait_filter (pid);
-
- /* if we got output, make a new string consiting of the shell ouptput
- plus whatever else was left on the original line */
- /* BUT: If this is inside a quoted string, directly add output to
- * the token */
- if (expn.data && qc) {
- mutt_buffer_addstr (dest, expn.data);
- FREE (&expn.data);
- }
- else if (expn.data) {
- expnlen = safe_strlen (expn.data);
- tok->dsize = expnlen + safe_strlen (tok->dptr) + 1;
- ptr = safe_malloc (tok->dsize);
- memcpy (ptr, expn.data, expnlen);
- strcpy (ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
- if (tok->destroy)
- FREE (&tok->data);
- tok->data = ptr;
- tok->dptr = ptr;
- tok->destroy = 1; /* mark that the caller should destroy this data */
- ptr = NULL;
- FREE (&expn.data);
- }
- }
- else if (ch == '$' && (!qc || qc == '"')
- && (*tok->dptr == '{' || isalpha ((unsigned char) *tok->dptr))) {
- char *env = NULL, *var = NULL;
-
- if (*tok->dptr == '{') {
- tok->dptr++;
- if ((pc = strchr (tok->dptr, '}'))) {
- var = str_substrdup (tok->dptr, pc);
- tok->dptr = pc + 1;
- }
- }
- else {
- for (pc = tok->dptr; isalpha ((unsigned char) *pc) || *pc == '_';
- pc++);
- var = str_substrdup (tok->dptr, pc);
- tok->dptr = pc;
- }
- if (var && (env = getenv (var)))
- mutt_buffer_addstr (dest, env);
- FREE (&var);
- }
- else
- mutt_buffer_addch (dest, ch);
- }
- mutt_buffer_addch (dest, 0); /* terminate the string */
- SKIPWS (tok->dptr);
- return 0;
+ return (-1);
}
static void add_to_list (LIST ** list, const char *str)
}
if (!*list || last) {
- t = (LIST *) safe_calloc (1, sizeof (LIST));
- t->data = safe_strdup (str);
+ t = (LIST *) mem_calloc (1, sizeof (LIST));
+ t->data = str_dup (str);
if (last) {
last->next = t;
last = last->next;
* the template, and leaving t pointed at the current item.
*/
t = last;
- FREE(t->template);
+ mem_free(t->template);
break;
}
if (!last->next)
}
/* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
- t->template = safe_strdup (templ);
+ t->template = str_dup (templ);
/* Find highest match number in template string */
t->nmatch = 0;
/* Being first is a special case. */
spam = *list;
- if (spam->rx && !safe_strcmp (spam->rx->pattern, pat)) {
+ if (!spam)
+ return 0;
+ if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
*list = spam->next;
rx_free (&spam->rx);
- FREE(&spam->template);
- FREE(&spam);
+ mem_free(&spam->template);
+ mem_free(&spam);
return 1;
}
prev = spam;
for (spam = prev->next; spam;) {
- if (!safe_strcmp (spam->rx->pattern, pat)) {
+ if (!str_cmp (spam->rx->pattern, pat)) {
prev->next = spam->next;
rx_free (&spam->rx);
- FREE(spam->template);
- FREE(spam);
+ mem_free(spam->template);
+ mem_free(spam);
spam = prev->next;
++nremoved;
}
{
LIST *p, *last = NULL;
- if (safe_strcmp ("*", str) == 0)
+ if (str_cmp ("*", str) == 0)
mutt_free_list (l); /* ``unCMD *'' means delete all current entries */
else {
p = *l;
last = NULL;
while (p) {
if (ascii_strcasecmp (str, p->data) == 0) {
- FREE (&p->data);
+ mem_free (&p->data);
if (last)
last->next = p->next;
else
(*l) = p->next;
- FREE (&p);
+ mem_free (&p);
}
else {
last = p;
{
int i = 0;
- if (safe_strcmp ("*", str) == 0) {
- list_del (l, rx_free);
+ if (str_cmp ("*", str) == 0) {
+ list_del (l, (list_del_t*) rx_free);
return (0);
}
else {
continue;
for (j = 0; b[j].name; j++)
- if (!ascii_strncasecmp (tmp->data, b[j].name, safe_strlen (tmp->data))
- && (safe_strlen (b[j].name) == safe_strlen (tmp->data))) {
+ if (!ascii_strncasecmp (tmp->data, b[j].name, str_len (tmp->data))
+ && (str_len (b[j].name) == str_len (tmp->data))) {
res = 1;
break;
}
char *p = NULL;
i = 0;
- j = safe_strlen (tmp->data);
+ j = str_len (tmp->data);
/* need at least input of 'feature_X' */
if (j >= 7) {
p = tmp->data + 7;
j -= 7;
while (Features[i].name) {
- if (safe_strlen (Features[i].name) == j &&
+ if (str_len (Features[i].name) == j &&
ascii_strncasecmp (Features[i].name, p, j)) {
res = 1;
break;
if ((data && res) || (!data && !res)) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
- FREE (&token.data);
+ mem_free (&token.data);
return (-1);
}
- FREE (&token.data);
+ mem_free (&token.data);
}
return 0;
}
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&Alternates, buf->data);
- if (safe_strcmp (buf->data, "*") &&
+ if (str_cmp (buf->data, "*") &&
add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
return -1;
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
- FREE (&templ.data);
+ mem_free (&templ.data);
return -1;
}
- FREE (&templ.data);
+ mem_free (&templ.data);
}
/* If not, try to remove from the nospam list. */
/* nospam only ever has one parameter. */
/* "*" is a special case. */
- if (!safe_strcmp (buf->data, "*")) {
+ if (!str_cmp (buf->data, "*")) {
mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, rx_free);
+ list_del (&NoSpamList, (list_del_t*) rx_free);
return 0;
}
/*
* Check for deletion of entire list
*/
- if (safe_strcmp (buf->data, "*") == 0) {
+ if (str_cmp (buf->data, "*") == 0) {
mutt_free_list ((LIST **) data);
break;
}
remove_from_rx_list (&SubscribedLists, buf->data);
remove_from_rx_list (&MailLists, buf->data);
- if (safe_strcmp (buf->data, "*") &&
+ if (str_cmp (buf->data, "*") &&
add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
- if (safe_strcmp (buf->data, "*") &&
+ if (str_cmp (buf->data, "*") &&
add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
do {
mutt_extract_token (buf, s, 0);
- if (safe_strcmp ("*", buf->data) == 0) {
+ if (str_cmp ("*", buf->data) == 0) {
if (CurrentMenu == MENU_ALIAS) {
for (tmp = Aliases; tmp; tmp = tmp->next)
tmp->del = 1;
}
else
for (tmp = Aliases; tmp; tmp = tmp->next) {
- if (safe_strcasecmp (buf->data, tmp->name) == 0) {
+ if (str_casecmp (buf->data, tmp->name) == 0) {
if (CurrentMenu == MENU_ALIAS) {
tmp->del = 1;
set_option (OPTFORCEREDRAWINDEX);
mutt_extract_token (buf, s, 0);
- dprint (2, (debugfile, "parse_alias: First token is '%s'.\n", buf->data));
+ 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 (!safe_strcasecmp (tmp->name, buf->data))
+ if (!str_casecmp (tmp->name, buf->data))
break;
last = tmp;
}
if (!tmp) {
/* create a new alias */
- tmp = (ALIAS *) safe_calloc (1, sizeof (ALIAS));
+ tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
tmp->self = tmp;
- tmp->name = safe_strdup (buf->data);
+ tmp->name = str_dup (buf->data);
/* give the main addressbook code a chance */
if (CurrentMenu == MENU_ALIAS)
set_option (OPTMENUCALLER);
mutt_extract_token (buf, s,
M_TOKEN_QUOTE | M_TOKEN_SPACE | M_TOKEN_SEMICOLON);
- dprint (2, (debugfile, "parse_alias: Second token is '%s'.\n", buf->data));
+ debug_print (2, ("second token is '%s'.\n", buf->data));
tmp->addr = mutt_parse_adrlist (tmp->addr, buf->data);
if (last)
last->next = tmp;
return -1;
}
#ifdef DEBUG
- if (debuglevel >= 2) {
+ if (DebugLevel >= 2) {
ADDRESS *a;
for (a = tmp->addr; a; a = a->next) {
if (!a->group)
- dprint (2, (debugfile, "parse_alias: %s\n", a->mailbox));
+ debug_print (2, ("%s\n", a->mailbox));
else
- dprint (2, (debugfile, "parse_alias: Group %s\n", a->mailbox));
+ debug_print (2, ("group %s\n", a->mailbox));
}
}
#endif
do {
mutt_extract_token (buf, s, 0);
- if (safe_strcmp ("*", buf->data) == 0)
+ if (str_cmp ("*", buf->data) == 0)
mutt_free_list (&UserHeader);
else {
tmp = UserHeader;
last = NULL;
- l = safe_strlen (buf->data);
+ l = str_len (buf->data);
if (buf->data[l - 1] == ':')
l--;
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
- FREE (&tmp->data);
+ mem_free (&tmp->data);
tmp->data = buf->data;
memset (buf, 0, sizeof (BUFFER));
return 0;
{
int i, flags = 0;
- if (safe_strncmp ("reverse-", s, 8) == 0) {
+ if (str_ncmp ("reverse-", s, 8) == 0) {
s += 8;
flags = SORT_REVERSE;
}
- if (safe_strncmp ("last-", s, 5) == 0) {
+ if (str_ncmp ("last-", s, 5) == 0) {
s += 5;
flags |= SORT_LAST;
}
switch (p->type & DT_MASK) {
case DT_STR:
if (!p->init && *((char **) p->data))
- p->init = (unsigned long) safe_strdup (*((char **) p->data));
+ p->init = (unsigned long) str_dup (*((char **) p->data));
break;
case DT_PATH:
if (!p->init && *((char **) p->data)) {
- char *cp = safe_strdup (*((char **) p->data));
+ char *cp = str_dup (*((char **) p->data));
/* mutt_pretty_mailbox (cp); */
p->init = (unsigned long) cp;
*tmp = '\0';
rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) p->data), 0);
- p->init = (unsigned long) safe_strdup (tmp);
+ p->init = (unsigned long) str_dup (tmp);
}
break;
case DT_RX:
rx_t* pp = (rx_t*) p->data;
if (!p->init && pp->pattern)
- p->init = (unsigned long) safe_strdup (pp->pattern);
+ p->init = (unsigned long) str_dup (pp->pattern);
break;
}
}
rx_t *pp = (rx_t *) p->data;
int flags = 0;
- FREE (&pp->pattern);
+ mem_free (&pp->pattern);
if (pp->rx) {
regfree (pp->rx);
- FREE (&pp->rx);
+ mem_free (&pp->rx);
}
if (p->init) {
char *s = (char *) p->init;
- pp->rx = safe_calloc (1, sizeof (regex_t));
- if (safe_strcmp (p->option, "mask") != 0)
+ pp->rx = mem_calloc (1, sizeof (regex_t));
+ if (str_cmp (p->option, "mask") != 0)
flags |= mutt_which_case ((const char *) p->init);
- if (safe_strcmp (p->option, "mask") == 0 && *s == '!') {
+ if (str_cmp (p->option, "mask") == 0 && *s == '!') {
s++;
pp->not = 1;
}
fprintf (stderr,
_("mutt_restore_default(%s): error in regexp: %s\n"),
p->option, pp->pattern);
- FREE (&pp->pattern);
+ mem_free (&pp->pattern);
regfree (pp->rx);
- FREE (&pp->rx);
+ mem_free (&pp->rx);
}
else
str_replace (&pp->pattern, (char *) p->init);
query = 1;
s->dptr++;
}
- else if (safe_strncmp ("no", s->dptr, 2) == 0) {
+ else if (str_ncmp ("no", s->dptr, 2) == 0) {
s->dptr += 2;
unset = !unset;
}
- else if (safe_strncmp ("inv", s->dptr, 3) == 0) {
+ else if (str_ncmp ("inv", s->dptr, 3) == 0) {
s->dptr += 3;
inv = !inv;
}
mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
if ((idx = mutt_option_index (tmp->data)) == -1 &&
- !(reset && !safe_strcmp ("all", tmp->data))) {
+ !(reset && !str_cmp ("all", tmp->data))) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
}
return (-1);
}
- if (!safe_strcmp ("all", tmp->data)) {
+ if (!str_cmp ("all", tmp->data)) {
for (idx = 0; MuttVars[idx].option; idx++)
mutt_restore_default (&MuttVars[idx]);
return 0;
if (DTYPE (MuttVars[idx].type) == DT_ADDR)
rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
else
- FREE ((void *) MuttVars[idx].data);
+ mem_free ((void *) MuttVars[idx].data);
}
else if (query || *s->dptr != '=') {
char _tmp[STRING];
if (DTYPE (MuttVars[idx].type) == DT_ADDR)
rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
else
- FREE ((void *) MuttVars[idx].data);
+ mem_free ((void *) MuttVars[idx].data);
mutt_extract_token (tmp, s, 0);
if (DTYPE (MuttVars[idx].type) == DT_PATH) {
strfcpy (scratch, tmp->data, sizeof (scratch));
mutt_expand_path (scratch, sizeof (scratch));
- *((char **) MuttVars[idx].data) = safe_strdup (scratch);
+ *((char **) MuttVars[idx].data) = str_dup (scratch);
}
else if (DTYPE (MuttVars[idx].type) == DT_STR) {
- *((char **) MuttVars[idx].data) = safe_strdup (tmp->data);
- if (safe_strcmp (MuttVars[idx].option, "charset") == 0)
+ *((char **) MuttVars[idx].data) = str_dup (tmp->data);
+ if (str_cmp (MuttVars[idx].option, "charset") == 0)
mutt_set_charset (Charset);
}
else {
}
if (option (OPTATTACHMSG)
- && !safe_strcmp (MuttVars[idx].option, "reply_regexp")) {
+ && !str_cmp (MuttVars[idx].option, "reply_regexp")) {
snprintf (err->data, err->dsize,
"Operation not permitted when in attach-message mode.");
r = -1;
/* copy the value of the string */
mutt_extract_token (tmp, s, 0);
- if (!ptr->pattern || safe_strcmp (ptr->pattern, tmp->data) != 0) {
+ if (!ptr->pattern || str_cmp (ptr->pattern, tmp->data) != 0) {
int not = 0;
/* $mask is case-sensitive */
- if (safe_strcmp (MuttVars[idx].option, "mask") != 0)
+ if (str_cmp (MuttVars[idx].option, "mask") != 0)
flags |= mutt_which_case (tmp->data);
p = tmp->data;
- if (safe_strcmp (MuttVars[idx].option, "mask") == 0) {
+ if (str_cmp (MuttVars[idx].option, "mask") == 0) {
if (*p == '!') {
not = 1;
p++;
}
}
- rx = (regex_t *) safe_malloc (sizeof (regex_t));
+ rx = (regex_t *) mem_malloc (sizeof (regex_t));
if ((e = REGCOMP (rx, p, flags)) != 0) {
regerror (e, rx, err->data, err->dsize);
regfree (rx);
- FREE (&rx);
+ mem_free (&rx);
break;
}
/* get here only if everything went smootly */
if (ptr->pattern) {
- FREE (&ptr->pattern);
+ mem_free (&ptr->pattern);
regfree ((regex_t *) ptr->rx);
- FREE (&ptr->rx);
+ mem_free (&ptr->rx);
}
- ptr->pattern = safe_strdup (tmp->data);
+ ptr->pattern = str_dup (tmp->data);
ptr->rx = rx;
ptr->not = not;
/* $reply_regexp and $alterantes require special treatment */
if (Context && Context->msgcount &&
- safe_strcmp (MuttVars[idx].option, "reply_regexp") == 0) {
+ str_cmp (MuttVars[idx].option, "reply_regexp") == 0) {
regmatch_t pmatch[1];
int i;
*ptr = (short) val;
/* these ones need a sanity check */
- if (safe_strcmp (MuttVars[idx].option, "history") == 0) {
+ if (str_cmp (MuttVars[idx].option, "history") == 0) {
if (*ptr < 0)
*ptr = 0;
mutt_init_history ();
}
- else if (safe_strcmp (MuttVars[idx].option, "pager_index_lines") == 0) {
+ else if (str_cmp (MuttVars[idx].option, "pager_index_lines") == 0) {
if (*ptr < 0)
*ptr = 0;
}
size_t buflen;
pid_t pid;
- dprint (2, (debugfile, "Reading configuration file '%s'.\n", rcfile));
+ debug_print (2, ("reading configuration file '%s'.\n", rcfile));
+ str_replace (&CurRCFile, rcfile);
+ CurRCLine = 0;
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
memset (&token, 0, sizeof (token));
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
+ CurRCLine++;
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
- currentline = safe_strdup (linebuf);
+ currentline = str_dup (linebuf);
if (!currentline)
continue;
mutt_convert_string (¤tline, ConfigCharset, Charset, 0);
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
- FREE (¤tline);
+ mem_free (¤tline);
break;
}
}
rc = -1;
}
if (conv)
- FREE (¤tline);
+ mem_free (¤tline);
}
- FREE (&token.data);
- FREE (&linebuf);
+ mem_free (&token.data);
+ mem_free (&linebuf);
fclose (f);
if (pid != -1)
mutt_wait_filter (pid);
memset (&expn, 0, sizeof (expn));
expn.data = expn.dptr = line;
- expn.dsize = safe_strlen (line);
+ expn.dsize = str_len (line);
*err->data = 0;
}
mutt_extract_token (token, &expn, 0);
for (i = 0; Commands[i].name; i++) {
- if (!safe_strcmp (token->data, Commands[i].name)) {
+ if (!str_cmp (token->data, Commands[i].name)) {
if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
goto finish;
break;
r = 0;
finish:
if (expn.destroy)
- FREE (&expn.data);
+ mem_free (&expn.data);
return (r);
}
/* return the completed command */
strncpy (buffer, Completed, len - spaces);
}
- else if (!safe_strncmp (buffer, "set", 3)
- || !safe_strncmp (buffer, "unset", 5)
- || !safe_strncmp (buffer, "reset", 5)
- || !safe_strncmp (buffer, "toggle", 6)) { /* complete variables */
+ else if (!str_ncmp (buffer, "set", 3)
+ || !str_ncmp (buffer, "unset", 5)
+ || !str_ncmp (buffer, "reset", 5)
+ || !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
char *prefixes[] = { "no", "inv", "?", "&", 0 };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
- if (!safe_strncmp (buffer, "set", 3)) {
+ if (!str_ncmp (buffer, "set", 3)) {
for (num = 0; prefixes[num]; num++) {
- if (!safe_strncmp (pt, prefixes[num], safe_strlen (prefixes[num]))) {
- pt += safe_strlen (prefixes[num]);
+ if (!str_ncmp (pt, prefixes[num], str_len (prefixes[num]))) {
+ pt += str_len (prefixes[num]);
break;
}
}
strncpy (pt, Completed, buffer + len - pt - spaces);
}
- else if (!safe_strncmp (buffer, "exec", 4)) {
+ else if (!str_ncmp (buffer, "exec", 4)) {
struct binding_t *menu = km_get_table (CurrentMenu);
if (!menu && CurrentMenu != MENU_PAGER)
if (*pt == '=') /* abort if no var before the '=' */
return 0;
- if (safe_strncmp (buffer, "set", 3) == 0) {
+ if (str_ncmp (buffer, "set", 3) == 0) {
int idx;
strfcpy (var, pt, sizeof (var));
/* ignore the trailing '=' when comparing */
- var[safe_strlen (var) - 1] = 0;
+ var[str_len (var) - 1] = 0;
if ((idx = mutt_option_index (var)) == -1)
return 0; /* no such variable. */
else {
"reverse-" : "",
(*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
"", p);
+ }
+ else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
+ char *p;
+ switch (DefaultMagic) {
+ case M_MBOX:
+ p = "mbox";
+ break;
+ case M_MMDF:
+ p = "MMDF";
+ break;
+ case M_MH:
+ p = "MH";
+ break;
+ case M_MAILDIR:
+ p = "Maildir";
+ break;
+ default:
+ p = "unknown";
+ }
+ strfcpy (tmp, p, sizeof (tmp));
}
else if (DTYPE (MuttVars[idx].type) == DT_BOOL)
strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no",
snprintf (command, sizeof (command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
- FREE (&token.data);
+ mem_free (&token.data);
return 1;
}
printf ("%s\n", err.data);
}
- FREE (&token.data);
+ mem_free (&token.data);
return 0;
}
return (-1);
}
-#ifdef DEBUG
-static void start_debug (void)
-{
- time_t t;
- int i;
- char buf[_POSIX_PATH_MAX];
- char buf2[_POSIX_PATH_MAX];
-
- /* rotate the old debug logs */
- for (i = 3; i >= 0; i--) {
- snprintf (buf, sizeof (buf), "%s/.muttdebug%d", NONULL (Homedir), i);
- snprintf (buf2, sizeof (buf2), "%s/.muttdebug%d", NONULL (Homedir),
- i + 1);
- rename (buf, buf2);
- }
- if ((debugfile = safe_fopen (buf, "w")) != NULL) {
- t = time (0);
- setbuf (debugfile, NULL); /* don't buffer the debugging output! */
- fprintf (debugfile,
- "Mutt-ng %s started at %s.\nDebugging at level %d.\n\n",
- MUTT_VERSION, asctime (localtime (&t)), debuglevel);
- }
-}
-#endif
-
static int mutt_execute_commands (LIST * p)
{
BUFFER err, token;
for (; p; p = p->next) {
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
- FREE (&token.data);
+ mem_free (&token.data);
return (-1);
}
}
- FREE (&token.data);
+ mem_free (&token.data);
return 0;
}
/* on one of the systems I use, getcwd() does not return the same prefix
as is listed in the passwd file */
if ((p = getenv ("HOME")))
- Homedir = safe_strdup (p);
+ Homedir = str_dup (p);
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- Username = safe_strdup (pw->pw_name);
+ Username = str_dup (pw->pw_name);
if (!Homedir)
- Homedir = safe_strdup (pw->pw_dir);
+ Homedir = str_dup (pw->pw_dir);
- Realname = safe_strdup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
- Shell = safe_strdup (pw->pw_shell);
+ Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
+ Shell = str_dup (pw->pw_shell);
}
else {
if (!Homedir) {
exit (1);
}
if ((p = getenv ("USER")))
- Username = safe_strdup (p);
+ Username = str_dup (p);
else {
mutt_endwin (NULL);
fputs (_("unable to determine username"), stderr);
exit (1);
}
- Shell = safe_strdup ((p = getenv ("SHELL")) ? p : "/bin/sh");
+ Shell = str_dup ((p = getenv ("SHELL")) ? p : "/bin/sh");
}
-#ifdef DEBUG
- /* Start up debugging mode if requested */
- if (debuglevel > 0)
- start_debug ();
-#endif
+ debug_start(Homedir);
/* And about the host... */
uname (&utsname);
strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
}
else
- Hostname = safe_strdup (utsname.nodename);
+ Hostname = str_dup (utsname.nodename);
#ifndef DOMAIN
#define DOMAIN buffer
if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
- Fqdn = safe_strdup ("@");
+ Fqdn = str_dup ("@");
else
#endif /* DOMAIN */
if (*DOMAIN != '@') {
- Fqdn = safe_malloc (safe_strlen (DOMAIN) + safe_strlen (Hostname) + 2);
+ Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
}
else
- Fqdn = safe_strdup (NONULL (Hostname));
+ Fqdn = str_dup (NONULL (Hostname));
#ifdef USE_NNTP
{
&& (*i != '\n'))
i++;
*i = '\0';
- NewsServer = safe_strdup (p);
+ NewsServer = str_dup (p);
fclose (f);
}
}
if ((p = getenv ("NNTPSERVER")))
- NewsServer = safe_strdup (p);
+ NewsServer = str_dup (p);
#endif
if ((p = getenv ("MAIL")))
- Spoolfile = safe_strdup (p);
+ Spoolfile = str_dup (p);
else if ((p = getenv ("MAILDIR")))
- Spoolfile = safe_strdup (p);
+ Spoolfile = str_dup (p);
else {
#ifdef HOMESPOOL
mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
#else
mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
#endif
- Spoolfile = safe_strdup (buffer);
+ Spoolfile = str_dup (buffer);
}
if ((p = getenv ("MAILCAPS")))
- MailcapPath = safe_strdup (p);
+ MailcapPath = str_dup (p);
else {
/* Default search path from RFC1524 */
MailcapPath =
- safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
+ str_dup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
"/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
}
- Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp");
+ Tempdir = str_dup ((p = getenv ("TMPDIR")) ? p : "/tmp");
p = getenv ("VISUAL");
if (!p) {
if (!p)
p = "vi";
}
- Editor = safe_strdup (p);
- Visual = safe_strdup (p);
+ Editor = str_dup (p);
+ Visual = str_dup (p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
memset (&buf, 0, sizeof (buf));
buf.data = buf.dptr = buffer;
- buf.dsize = safe_strlen (buffer);
+ buf.dsize = str_len (buffer);
memset (&token, 0, sizeof (token));
parse_my_hdr (&token, &buf, 0, &err);
- FREE (&token.data);
+ mem_free (&token.data);
}
if ((p = getenv ("EMAIL")) != NULL)
NONULL (Homedir));
default_rc = 1;
- Muttrc = safe_strdup (buffer);
+ Muttrc = str_dup (buffer);
}
else {
strfcpy (buffer, Muttrc, sizeof (buffer));
- FREE (&Muttrc);
+ mem_free (&Muttrc);
mutt_expand_path (buffer, sizeof (buffer));
- Muttrc = safe_strdup (buffer);
+ Muttrc = str_dup (buffer);
}
- FREE (&AliasFile);
- AliasFile = safe_strdup (NONULL (Muttrc));
+ mem_free (&AliasFile);
+ AliasFile = str_dup (NONULL (Muttrc));
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (mutt_execute_commands (commands) != 0)
need_pause = 1;
+ /* warn about synonym variables */
+ if (!list_empty(Synonyms)) {
+ int i = 0;
+ fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
+ for (i = 0; i < Synonyms->length; i++)
+ fprintf (stderr, "$%s ($%s should be used) (%s:%d)\n",
+ MuttVars[((syn_t*) Synonyms->data[i])->o].option,
+ MuttVars[((syn_t*) Synonyms->data[i])->n].option,
+ NONULL(((syn_t*) Synonyms->data[i])->f),
+ ((syn_t*) Synonyms->data[i])->l);
+ fprintf (stderr, _("Warning: Synonym variables are scheduled for removal.\n"));
+ list_del (&Synonyms, syn_del);
+ need_pause = 1;
+ }
+ /* this is not needed during runtime */
+ mem_free(&CurRCFile);
+
if (need_pause && !option (OPTNOCURSES)) {
if (mutt_any_key_to_continue (NULL) == -1)
mutt_exit (1);
return c->data;
return 0;
}
+
+static int opt_cmp (const void* a, const void* b) {
+ return (str_cmp ((*(struct option_t**) a)->option,
+ (*(struct option_t**) b)->option));
+}
+
+/* dump out the value of all the variables we have */
+int mutt_dump_variables (void) {
+ int i;
+
+ char errbuff[STRING];
+ char command[STRING];
+ list2_t* tmp = NULL;
+
+ BUFFER err, token;
+
+ memset (&err, 0, sizeof (err));
+ memset (&token, 0, sizeof (token));
+
+ err.data = errbuff;
+ err.dsize = sizeof (errbuff);
+
+ /* get all non-synonyms into list... */
+ for (i = 0; MuttVars[i].option; i++) {
+ if (MuttVars[i].type == DT_SYN)
+ continue;
+ list_push_back (&tmp, &MuttVars[i]);
+ }
+ if (!list_empty(tmp)) {
+ /* ...and dump list sorted */
+ qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
+ for (i = 0; i < tmp->length; i++) {
+ snprintf (command, sizeof (command), "set ?%s\n",
+ ((struct option_t*) tmp->data[i])->option);
+ if (mutt_parse_rc_line (command, &token, &err) == -1) {
+ fprintf (stderr, "%s\n", err.data);
+ mem_free (&token.data);
+ list_del (&tmp, NULL);
+ return 1;
+ }
+ printf("%s\n", err.data);
+ }
+ }
+ mem_free (&token.data);
+ list_del (&tmp, NULL);
+ return 0;
+}
projects / apps / madmutt.git / blobdiff