# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "buffer.h"
#include "ascii.h"
const struct mapping_t *map,
char* errbuf, size_t errlen);
-static HASH* ConfigOptions = NULL;
+static HASH *ConfigOptions = NULL;
/* for synonym warning reports: synonym found during parsing */
typedef struct {
set_option (dst->data);
else
unset_option (dst->data);
- return (0);
+ return (1);
}
static void num_to_string (char* dst, size_t dstlen,
struct option_t* option) {
/* XXX puke */
- const char* fmt = (str_cmp (option->option, "umask") == 0) ?
+ const char* fmt = (str_cmp (option->option, "umask") == 0) ?
"%s=%04o" : "%s=%d";
snprintf (dst, dstlen, fmt, option->option,
*((short*) option->data));
static void sys_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- char* val = NULL, *t = NULL;
+ char *val = NULL, *t = NULL;
int clean = 0;
/* get some $muttng_ values dynamically */
if (ascii_strcmp ("muttng_pwd", option->option) == 0) {
- val = mem_malloc (_POSIX_PATH_MAX);
+ 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 &&
val = CurrentFolder;
} else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
- if ((t = strrchr (CurrentFolder, '/')) != NULL)
+
+ size_t Maildirlength = str_len (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,
+ Maildirlength) == 0 &&
+ str_len (CurrentFolder) > Maildirlength) {
+ val = CurrentFolder + Maildirlength;
+ if (Maildir[strlen(Maildir)-1]!='/')
+ val += 1;
+ /* if not $folder, just use everything after last / */
+ } else if ((t = strrchr (CurrentFolder, '/')) != NULL)
val = t+1;
+ /* default: use as-is */
else
val = CurrentFolder;
+
} else
val = option->init;
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
if (clean)
- mem_free (&val);
+ p_delete(&val);
}
static int path_from_string (struct option_t* dst, const char* val,
return (0);
if (!val || !*val) {
- mem_free ((char**) dst->data);
+ p_delete((char**) dst->data);
return (1);
}
path[0] = '\0';
- strfcpy (path, val, sizeof (path));
- mutt_expand_path (path, sizeof (path));
+ strfcpy (path, val, sizeof(path));
+ mutt_expand_path (path, sizeof(path));
str_replace ((char **) dst->data, path);
return (1);
}
static void quad_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
snprintf (dst, dstlen, "%s=%s", option->option,
vals[quadoption (option->data)]);
}
static void sort_to_string (char* dst, size_t dstlen,
struct option_t* option) {
const struct mapping_t *map = get_sortmap (option);
- char* p = NULL;
+ const char *p = NULL;
if (!map) {
- snprintf (dst, sizeof (dst), "%s=unknown", option->option);
+ snprintf (dst, sizeof(dst), "%s=unknown", option->option);
return;
}
- p = mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
- map);
+ p = mutt_getnamebyvalue(*((short *)option->data) & SORT_MASK, map);
snprintf (dst, dstlen, "%s=%s%s%s", option->option,
(*((short *) option->data) & SORT_REVERSE) ?
}
if (!((rx_t*) dst->data))
- *((rx_t**) dst->data) = mem_calloc (1, sizeof (rx_t));
+ *((rx_t**) dst->data) = p_new(rx_t, 1);
p = (rx_t*) dst->data;
s++;
}
- rx = mem_malloc (sizeof (regex_t));
+ rx = p_new(regex_t, 1);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
regfree (rx);
- mem_free (&rx);
+ p_delete(&rx);
+ return (0);
}
- if (p->pattern) {
+ if (p->rx) {
regfree (p->rx);
- mem_free (&p->rx);
+ p_delete(&p->rx);
}
str_replace (&p->pattern, val);
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**) 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) {
- if (!dst || !val || !*val)
+ if (!dst)
return (0);
rfc822_free_address ((ADDRESS**) dst->data);
- *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
+ if (val && *val)
+ *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
return (1);
}
*dst = '\0';
return (0);
}
- tmp = mem_malloc (dstlen+1);
+ tmp = p_new(char, dstlen+1);
FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
/* as we get things of type $var=value and don't want to bloat the
}
}
memcpy (dst, t, l+1);
- mem_free (&tmp);
+ p_delete(&tmp);
debug_print (1, ("stripped == '%s'\n", dst));
return (1);
/* for synonym warning reports: adds synonym to end of list */
static void syn_add (struct option_t* n, struct option_t* o) {
- syn_t* tmp = mem_malloc (sizeof (syn_t));
+ syn_t* tmp = p_new(syn_t, 1);
tmp->f = str_dup (CurRCFile);
tmp->l = CurRCLine;
tmp->n = n;
/* 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);
+ p_delete(&(*(syn_t**) p)->f);
+ p_delete(p);
}
void toggle_quadoption (int opt)
}
if (!*list || last) {
- t = (LIST *) mem_calloc (1, sizeof (LIST));
+ t = p_new(LIST, 1);
t->data = str_dup (str);
if (last) {
last->next = t;
* the template, and leaving t pointed at the current item.
*/
t = last;
- mem_free(t->template);
+ p_delete(&t->template);
break;
}
if (!last->next)
if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
*list = spam->next;
rx_free (&spam->rx);
- mem_free(&spam->template);
- mem_free(&spam);
+ p_delete(&spam->template);
+ p_delete(&spam);
return 1;
}
if (!str_cmp (spam->rx->pattern, pat)) {
prev->next = spam->next;
rx_free (&spam->rx);
- mem_free(spam->template);
- mem_free(spam);
+ p_delete(&spam->template);
+ p_delete(&spam);
spam = prev->next;
++nremoved;
}
last = NULL;
while (p) {
if (ascii_strcasecmp (str, p->data) == 0) {
- mem_free (&p->data);
+ p_delete(&p->data);
if (last)
last->next = p->next;
else
(*l) = p->next;
- mem_free (&p);
+ p_delete(&p);
}
else {
last = p;
BUFFER token;
struct option_t* option = NULL;
- memset (&token, 0, sizeof (token));
+ memset (&token, 0, sizeof(token));
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
if (data == res) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
- mem_free (&token.data);
+ p_delete(&token.data);
return (-1);
}
- mem_free (&token.data);
+ p_delete(&token.data);
}
return 0;
}
{
BUFFER templ;
- memset (&templ, 0, sizeof (templ));
+ memset (&templ, 0, sizeof(templ));
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
- mem_free (&templ.data);
+ p_delete(&templ.data);
return -1;
}
- mem_free (&templ.data);
+ p_delete(&templ.data);
}
/* If not, try to remove from the nospam list. */
return 0;
}
+/* always wise to do what someone else did before */
+static void _attachments_clean (void) {
+ int i;
+ if (Context && Context->msgcount) {
+ for (i = 0; i < Context->msgcount; i++)
+ Context->hdrs[i]->attach_valid = 0;
+ }
+}
+
+static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
+ BUFFER *err) {
+ ATTACH_MATCH *a;
+ LIST *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;
+ }
+
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!buf->data || *buf->data == '\0')
+ continue;
+
+ a = p_new(ATTACH_MATCH, 1);
+
+ /* some cheap hacks that I expect to remove */
+ if (!str_casecmp(buf->data, "any"))
+ a->major = str_dup("*/.*");
+ else if (!str_casecmp(buf->data, "none"))
+ a->major = str_dup("cheap_hack/this_should_never_match");
+ else
+ a->major = str_dup(buf->data);
+
+ if ((p = strchr(a->major, '/'))) {
+ *p = '\0';
+ ++p;
+ a->minor = p;
+ } else {
+ a->minor = "unknown";
+ }
+
+ len = str_len (a->minor);
+ tmpminor = p_new(char, len + 3);
+ strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
+ tmpminor[0] = '^';
+ tmpminor[len+1] = '$';
+ tmpminor[len+2] = '\0';
+
+ a->major_int = mutt_check_mime_type(a->major);
+ regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
+
+ 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->data = (char *)a;
+ listp->next = NULL;
+ if (lastp) {
+ lastp->next = listp;
+ } else {
+ *ldata = listp;
+ }
+ lastp = listp;
+ }
+ while (MoreArgs (s));
+
+ _attachments_clean();
+ return 0;
+}
+
+static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err) {
+ ATTACH_MATCH *a;
+ LIST *lp, *lastp, *newlp;
+ char *tmp;
+ int major;
+ char *minor;
+
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!str_casecmp(buf->data, "any"))
+ tmp = str_dup("*/.*");
+ else if (!str_casecmp(buf->data, "none"))
+ tmp = str_dup("cheap_hack/this_should_never_match");
+ else
+ tmp = str_dup(buf->data);
+
+ if ((minor = strchr(tmp, '/'))) {
+ *minor = '\0';
+ ++minor;
+ } else {
+ minor = "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. */
+ 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));
+ regfree(&a->minor_rx);
+ p_delete(&a->major);
+
+ /* Relink backward */
+ if (lastp)
+ lastp->next = lp->next;
+ else
+ *ldata = lp->next;
+
+ newlp = lp->next;
+ p_delete(&lp->data); /* same as a */
+ p_delete(&lp);
+ lp = newlp;
+ continue;
+ }
+
+ lastp = lp;
+ lp = lp->next;
+ }
+ }
+ while (MoreArgs (s));
+
+ p_delete(&tmp);
+ _attachments_clean();
+ return 0;
+}
+
+static int print_attach_list (LIST *lp, char op, const char *name) {
+ while (lp) {
+ printf("attachments %c%s %s/%s\n", op, name,
+ ((ATTACH_MATCH *)lp->data)->major,
+ ((ATTACH_MATCH *)lp->data)->minor);
+ lp = lp->next;
+ }
+
+ return 0;
+}
+
+static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+ char op, *category;
+ LIST **listp;
+
+ mutt_extract_token(buf, s, 0);
+ if (!buf->data || *buf->data == '\0') {
+ strfcpy(err->data, _("attachments: no disposition"), err->dsize);
+ return -1;
+ }
+
+ category = buf->data;
+ op = *category++;
+
+ if (op == '?') {
+ mutt_endwin (NULL);
+ fflush (stdout);
+ printf("\nCurrent attachments settings:\n\n");
+ print_attach_list(AttachAllow, '+', "A");
+ print_attach_list(AttachExclude, '-', "A");
+ print_attach_list(InlineAllow, '+', "I");
+ print_attach_list(InlineExclude, '-', "I");
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ mutt_any_key_to_continue (NULL);
+ return 0;
+ }
+
+ if (op != '+' && op != '-') {
+ op = '+';
+ category--;
+ }
+ if (!str_ncasecmp(category, "attachment", strlen(category))) {
+ if (op == '+')
+ listp = &AttachAllow;
+ else
+ listp = &AttachExclude;
+ }
+ else if (!str_ncasecmp(category, "inline", strlen(category))) {
+ if (op == '+')
+ listp = &InlineAllow;
+ else
+ listp = &InlineExclude;
+ } else {
+ strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
+ return -1;
+ }
+
+ return parse_attach_list(buf, s, listp, err);
+}
+
+static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+ char op, *p;
+ LIST **listp;
+
+ mutt_extract_token(buf, s, 0);
+ if (!buf->data || *buf->data == '\0') {
+ strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
+ return -1;
+ }
+
+ p = buf->data;
+ op = *p++;
+ if (op != '+' && op != '-') {
+ op = '+';
+ p--;
+ }
+ if (!str_ncasecmp(p, "attachment", strlen(p))) {
+ if (op == '+')
+ listp = &AttachAllow;
+ else
+ listp = &AttachExclude;
+ }
+ else if (!str_ncasecmp(p, "inline", strlen(p))) {
+ if (op == '+')
+ listp = &InlineAllow;
+ else
+ listp = &InlineExclude;
+ }
+ else {
+ strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
+ return -1;
+ }
+
+ return parse_unattach_list(buf, s, listp, err);
+}
+
static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
BUFFER * err)
{
if (!tmp) {
/* create a new alias */
- tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
+ tmp = p_new(ALIAS, 1);
tmp->self = tmp;
tmp->name = str_dup (buf->data);
/* give the main addressbook code a chance */
if (DebugLevel >= 2) {
ADDRESS *a;
- for (a = tmp->addr; a; a = a->next) {
+ /* 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
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
- mem_free (&tmp->data);
+ p_delete(&tmp->data);
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ memset (buf, 0, sizeof(BUFFER));
return 0;
}
if (!tmp->next)
UserHeader = tmp;
}
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ memset (buf, 0, sizeof(BUFFER));
return 0;
}
}
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_set_default (const char* name, void* p, unsigned long more) {
- char buf[LONG_STRING];
- struct option_t* ptr = (struct option_t*) p;
+static void mutt_set_default(const char *name, void* p, unsigned long more)
+{
+ char buf[LONG_STRING];
+ struct option_t *ptr = p;
- if (DTYPE (ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find (ConfigOptions, (char*) ptr->data);
- }
- if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
- return;
- mutt_option_value (ptr->option, buf, sizeof (buf));
- if (str_len (ptr->init) == 0 && buf && *buf)
- ptr->init = str_dup (buf);
+ if (DTYPE(ptr->type) == DT_SYN) {
+ if (!more)
+ return;
+ ptr = hash_find(ConfigOptions, (const char *)ptr->data);
+ }
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+ return;
+
+ mutt_option_value(ptr->option, buf, sizeof(buf));
+ if (str_len(ptr->init) == 0 && buf && *buf)
+ ptr->init = str_dup(buf);
}
static struct option_t* add_option (const char* name, const char* init,
- short type, short dup) {
- struct option_t* option = mem_calloc (1, sizeof (struct option_t));
+ short type, short dodup) {
+ struct option_t* option = p_new(struct option_t, 1);
debug_print (1, ("adding $%s\n", name));
option->option = str_dup (name);
option->type = type;
if (init)
- option->init = dup ? str_dup (init) : (char*) init;
+ option->init = dodup ? str_dup (init) : (char*) init;
return (option);
}
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)));
- mem_free (&ptr->option);
- mem_free (&s);
- mem_free (&ptr->init);
- mem_free (&ptr);
+ p_delete(&ptr->option);
+ p_delete(&s);
+ p_delete(&ptr->init);
+ p_delete(&ptr);
+}
+
+static int init_expand (char** dst, struct option_t* src) {
+ BUFFER token, in;
+ size_t len = 0;
+
+ p_delete(dst);
+
+ if (DTYPE(src->type) == DT_STR ||
+ DTYPE(src->type) == DT_PATH) {
+ /* only expand for string as it's the only place where
+ * we want to expand vars right now */
+ if (src->init && *src->init) {
+ memset (&token, 0, sizeof(BUFFER));
+ memset (&in, 0, sizeof(BUFFER));
+ len = str_len (src->init) + 2;
+ in.data = p_new(char, len + 1);
+ snprintf (in.data, len, "\"%s\"", src->init);
+ in.dptr = in.data;
+ in.dsize = len;
+ mutt_extract_token (&token, &in, 0);
+ if (token.data && *token.data)
+ *dst = str_dup (token.data);
+ else
+ *dst = str_dup ("");
+ p_delete(&in.data);
+ p_delete(&token.data);
+ } else
+ *dst = str_dup ("");
+ } else
+ /* for non-string: take value as is */
+ *dst = str_dup (src->init);
+ return (1);
}
/* if additional data more == 1, we want to resolve synonyms */
unsigned long more) {
char errbuf[STRING];
struct option_t* ptr = (struct option_t*) p;
+ char* init = NULL;
if (DTYPE (ptr->type) == DT_SYN) {
if (!more)
}
if (!ptr)
return;
- if (FuncTable[DTYPE (ptr->type)].opt_from_string &&
- FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, ptr->init, errbuf,
- sizeof (errbuf)) < 0) {
- mutt_endwin (NULL);
- fprintf (stderr, _("Invalid default setting found. Please report this "
- "error:\n\"%s\"\n"), errbuf);
- exit (1);
+ if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
+ init_expand (&init, ptr);
+ if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
+ sizeof(errbuf))) {
+ if (!option (OPTNOCURSES))
+ mutt_endwin (NULL);
+ fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
+ "Please report this error: \"%s\"\n"),
+ ptr->option, NONULL (init), errbuf);
+ exit (1);
+ }
+ p_delete(&init);
}
if (ptr->flags & R_INDEX)
rc = 0;
break;
}
- list_del (&list, (list_del_t*) _mem_free);
+ list_del (&list, (list_del_t*)xmemfree);
return (rc);
}
return (map);
}
+#define CHECK_PAGER \
+ if ((CurrentMenu == MENU_PAGER) && \
+ (!option || (option->flags & R_RESORT))) \
+ { \
+ snprintf (err->data, err->dsize, \
+ _("Not available in this menu.")); \
+ return (-1); \
+ }
+
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
/* resolve synonyms */
- if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
+ if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
DTYPE (option->type == DT_SYN)) {
struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
syn_add (newopt, option);
}
if (!str_cmp ("all", tmp->data)) {
+ if (CurrentMenu == MENU_PAGER) {
+ snprintf (err->data, err->dsize, _("Not available in this menu."));
+ return (-1);
+ }
hash_map (ConfigOptions, mutt_restore_default, 1);
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ set_option (OPTSORTSUBTHREADS);
+ set_option (OPTNEEDRESORT);
+ set_option (OPTRESORTINIT);
+ set_option (OPTREDRAWTREE);
return (0);
}
else if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"), option->option);
r = -1;
break;
- } else
+ } else {
+ CHECK_PAGER;
mutt_restore_default (NULL, option, 1);
+ }
}
else if (DTYPE (option->type) == DT_BOOL) {
/* XXX this currently ignores the function table
return 0;
}
+ CHECK_PAGER;
if (unset)
unset_option (option->data);
else if (inv)
DTYPE (option->type) == DT_USER ||
DTYPE (option->type) == DT_SYS) {
if (unset) {
+ CHECK_PAGER;
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
hash_delete (ConfigOptions, option->option,
option, del_option);
else
- mem_free ((void *) option->data);
+ p_delete((void **)&option->data);
break;
}
}
r = -1;
break;
} else {
+ CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (!FuncTable[DTYPE (option->type)].opt_from_string
}
if (*s->dptr == '=') {
+ CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (ascii_strcasecmp ("yes", tmp->data) == 0)
return (-1);
}
- memset (&token, 0, sizeof (token));
+ memset (&token, 0, sizeof(token));
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
- mem_free (¤tline);
+ p_delete(¤tline);
break;
}
}
rc = -1;
}
if (conv)
- mem_free (¤tline);
+ p_delete(¤tline);
}
- mem_free (&token.data);
- mem_free (&linebuf);
+ p_delete(&token.data);
+ p_delete(&linebuf);
fclose (f);
if (pid != -1)
mutt_wait_filter (pid);
return (-1);
}
- strfcpy (path, tmp->data, sizeof (path));
- mutt_expand_path (path, sizeof (path));
+ strfcpy (path, tmp->data, sizeof(path));
+ mutt_expand_path (path, sizeof(path));
rc += source_rc (path, err);
}
int i, r = -1;
BUFFER expn;
- memset (&expn, 0, sizeof (expn));
+ memset (&expn, 0, sizeof(expn));
expn.data = expn.dptr = line;
expn.dsize = str_len (line);
r = 0;
finish:
if (expn.destroy)
- mem_free (&expn.data);
+ p_delete(&expn.data);
return (r);
}
-#define NUMVARS (sizeof (MuttVars)/sizeof (MuttVars[0]))
-#define NUMCOMMANDS (sizeof (Commands)/sizeof (Commands[0]))
-/* initial string that starts completion. No telling how much crap
+#define NUMVARS (sizeof(MuttVars)/sizeof(MuttVars[0]))
+#define NUMCOMMANDS (sizeof(Commands)/sizeof(Commands[0]))
+/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
int Num_matched = 0; /* Number of matches for completion */
char Completed[STRING] = { 0 }; /* completed string (command or variable) */
-char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1]; /* all the matches + User_typed */
+const char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1]; /* all the matches + User_typed */
/* helper function for completion. Changes the dest buffer if
necessary/possible to aid completion.
try == user entered data for completion.
len == length of dest buffer.
*/
-static void candidate (char *dest, char *try, char *src, int len)
+static void candidate (char *dest, char *try, const char *src, int len)
{
int l;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
- sizeof (Completed));
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
/* return the completed command */
|| !str_ncmp (buffer, "unset", 5)
|| !str_ncmp (buffer, "reset", 5)
|| !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
- char *prefixes[] = { "no", "inv", "?", "&", 0 };
+ const char *prefixes[] = { "no", "inv", "?", "&", NULL };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
for (num = 0; MuttVars[num].option; num++)
candidate (Completed, User_typed, MuttVars[num].option,
- sizeof (Completed));
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
for (num = 0; menu[num].name; num++)
- candidate (Completed, User_typed, menu[num].name, sizeof (Completed));
+ candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
- sizeof (Completed));
+ sizeof(Completed));
}
Matches[Num_matched++] = User_typed;
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
return 0;
if (str_ncmp (buffer, "set", 3) == 0) {
- strfcpy (var, pt, sizeof (var));
+ strfcpy (var, pt, sizeof(var));
/* ignore the trailing '=' when comparing */
var[str_len (var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
char tmp[LONG_STRING], tmp2[LONG_STRING];
char *s, *d;
size_t dlen = buffer + len - pt - spaces;
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ 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));
+ strfcpy (tmp, NONULL (*((char **) option->data)), sizeof(tmp));
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_write_address (tmp, sizeof (tmp),
+ rfc822_write_address (tmp, sizeof(tmp),
*((ADDRESS **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
- strfcpy (tmp, vals[quadoption (option->data)], sizeof (tmp));
+ strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp));
else if (DTYPE (option->type) == DT_NUM)
- snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+ snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
else if (DTYPE (option->type) == DT_SORT) {
const struct mapping_t *map;
- char *p;
+ const char *p;
switch (option->type & DT_SUBTYPE_MASK) {
case DT_SORT_ALIAS:
map = SortMethods;
break;
}
- p =
- mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
- map);
- snprintf (tmp, sizeof (tmp), "%s%s%s",
- (*((short *) option->data) & SORT_REVERSE) ?
- "reverse-" : "",
- (*((short *) option->data) & SORT_LAST) ? "last-" :
- "", p);
- }
+ p = mutt_getnamebyvalue(*((short *) option->data) & SORT_MASK, map);
+ snprintf(tmp, sizeof(tmp), "%s%s%s",
+ (*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
+ (*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
+ }
else if (DTYPE (option->type) == DT_MAGIC) {
- char *p;
+ const char *p;
switch (DefaultMagic) {
case M_MBOX:
p = "mbox";
default:
p = "unknown";
}
- strfcpy (tmp, p, sizeof (tmp));
+ strfcpy (tmp, p, sizeof(tmp));
}
else if (DTYPE (option->type) == DT_BOOL)
strfcpy (tmp, option (option->data) ? "yes" : "no",
- sizeof (tmp));
+ sizeof(tmp));
else
return 0;
- for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof (tmp2) - 2;) {
+ for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof(tmp2) - 2;) {
if (*s == '\\' || *s == '"')
*d++ = '\\';
*d++ = *s++;
}
*d = '\0';
- strfcpy (tmp, pt, sizeof (tmp));
+ strfcpy (tmp, pt, sizeof(tmp));
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
BUFFER err, token;
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
+ memset (&err, 0, sizeof(err));
+ memset (&token, 0, sizeof(token));
err.data = errbuff;
- err.dsize = sizeof (errbuff);
+ err.dsize = sizeof(errbuff);
for (p = queries; p; p = p->next) {
- snprintf (command, sizeof (command), "set ?%s\n", p->data);
+ snprintf (command, sizeof(command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
- mem_free (&token.data);
+ p_delete(&token.data);
return 1;
}
printf ("%s\n", err.data);
}
- mem_free (&token.data);
+ p_delete(&token.data);
return 0;
}
-char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
+const char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
{
int i;
BUFFER err, token;
char errstr[SHORT_STRING];
- memset (&err, 0, sizeof (err));
+ memset (&err, 0, sizeof(err));
err.data = errstr;
- err.dsize = sizeof (errstr);
- memset (&token, 0, sizeof (token));
+ err.dsize = sizeof(errstr);
+ memset (&token, 0, sizeof(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);
- mem_free (&token.data);
+ p_delete(&token.data);
return (-1);
}
}
- mem_free (&token.data);
+ p_delete(&token.data);
return 0;
}
{
struct passwd *pw;
struct utsname utsname;
- char *p, buffer[STRING], error[STRING];
+ const char *p;
+ char buffer[STRING], error[STRING];
int i, default_rc = 0, need_pause = 0;
BUFFER err;
- memset (&err, 0, sizeof (err));
+ memset (&err, 0, sizeof(err));
err.data = error;
- err.dsize = sizeof (error);
+ err.dsize = sizeof(error);
- /* use 3*sizeof(muttvars) instead of 2*sizeof()
+ /* use 3*sizeof(muttvars) instead of 2*sizeof()
* to have some room for $user_ vars */
- ConfigOptions = hash_create (sizeof (MuttVars) * 3);
+ ConfigOptions = hash_create (sizeof(MuttVars) * 3);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
DT_SYS, 0), 0);
}
- /*
+ /*
* XXX - use something even more difficult to predict?
*/
- snprintf (AttachmentMarker, sizeof (AttachmentMarker),
+ snprintf (AttachmentMarker, sizeof(AttachmentMarker),
"\033]9;%ld\a", (long) time (NULL));
/* on one of the systems I use, getcwd() does not return the same prefix
if (!Homedir)
Homedir = str_dup (pw->pw_dir);
- Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
+ Realname = str_dup (mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
Shell = str_dup (pw->pw_shell);
endpwent ();
}
if ((p = strchr (utsname.nodename, '.'))) {
Hostname = str_substrdup (utsname.nodename, p);
p++;
- strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
+ strfcpy (buffer, p, sizeof(buffer)); /* save the domain for below */
}
else
Hostname = str_dup (utsname.nodename);
#ifndef DOMAIN
#define DOMAIN buffer
- if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
+ if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
Fqdn = str_dup ("@");
else
#endif /* DOMAIN */
if (*DOMAIN != '@') {
- Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
+ Fqdn = p_new(char, str_len(DOMAIN) + str_len(Hostname) + 2);
sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
}
else
#ifdef USE_NNTP
{
FILE *f;
- char *i;
+ char *q;
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
- fgets (buffer, sizeof (buffer), f);
- p = (char*) &buffer;
+ fgets (buffer, sizeof(buffer), f);
+ p = buffer;
SKIPWS (p);
- i = p;
- while (*i && (*i != ' ') && (*i != '\t') && (*i != '\r')
- && (*i != '\n'))
- i++;
- *i = '\0';
+ q = (char*)p;
+ while (*q && !isspace(*q))
+ q++;
+ *q = '\0';
NewsServer = str_dup (p);
fclose (f);
}
Spoolfile = str_dup (p);
else {
#ifdef HOMESPOOL
- mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
+ mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
#else
- mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
+ mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
#endif
Spoolfile = str_dup (buffer);
}
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
- snprintf (buffer, sizeof (buffer), "Reply-To: %s", p);
+ snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
- memset (&buf, 0, sizeof (buf));
+ memset (&buf, 0, sizeof(buf));
buf.data = buf.dptr = buffer;
buf.dsize = str_len (buffer);
- memset (&token, 0, sizeof (token));
+ memset (&token, 0, sizeof(token));
parse_my_hdr (&token, &buf, 0, &err);
- mem_free (&token.data);
+ p_delete(&token.data);
}
if ((p = getenv ("EMAIL")) != NULL)
/*
- *
+ *
* 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/.muttngrc-%s", NONULL (Homedir),
+ snprintf (buffer, sizeof(buffer), "%s/.muttngrc-%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/.muttngrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
#if 0
- snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s",
+ snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc",
+ snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc",
NONULL (Homedir));
default_rc = 1;
Muttrc = str_dup (buffer);
}
else {
- strfcpy (buffer, Muttrc, sizeof (buffer));
- mem_free (&Muttrc);
- mutt_expand_path (buffer, sizeof (buffer));
+ strfcpy (buffer, Muttrc, sizeof(buffer));
+ p_delete(&Muttrc);
+ mutt_expand_path (buffer, sizeof(buffer));
Muttrc = str_dup (buffer);
}
- mem_free (&AliasFile);
+ p_delete(&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 (!skip_sys_rc) {
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", SYSCONFDIR);
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", PKGDATADIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", PKGDATADIR);
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
}
else if (!default_rc) {
/* file specified by -F does not exist */
- snprintf (buffer, sizeof (buffer), "%s: %s", Muttrc, strerror (errno));
+ snprintf (buffer, sizeof(buffer), "%s: %s", Muttrc, strerror (errno));
mutt_endwin (buffer);
exit (1);
}
if (DTYPE (option->type) == DT_SYN)
return;
- mutt_option_value (option->option, buf, sizeof (buf));
+ mutt_option_value (option->option, buf, sizeof(buf));
if (str_cmp (buf, option->init) != 0)
list_push_back (l, option);
}
if (!list_empty(tmp)) {
/* ...and dump list sorted */
- qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
+ qsort (tmp->data, tmp->length, sizeof(void*), opt_cmp);
for (i = 0; i < tmp->length; i++) {
option = (struct option_t*) tmp->data[i];
FuncTable[DTYPE (option->type)].opt_to_string
- (outbuf, sizeof (outbuf), option);
+ (outbuf, sizeof(outbuf), option);
printf ("%s\n", outbuf);
}
}
projects / apps / madmutt.git / blobdiff