#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/rx.h>
-#include "lib/rx.h"
-#include "lib/debug.h"
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
-#include "mapping.h"
#include "sort.h"
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
static struct mapping_t AliasHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
- {N_("Undel"), OP_UNDELETE},
- {N_("Select"), OP_GENERIC_SELECT_ENTRY},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
+ {N_("Exit"), OP_EXIT},
+ {N_("Del"), OP_DELETE},
+ {N_("Undel"), OP_UNDELETE},
+ {N_("Select"), OP_GENERIC_SELECT_ENTRY},
+ {N_("Help"), OP_HELP},
+ {NULL, OP_NULL}
};
-ADDRESS *mutt_lookup_alias (const char *s)
+void alias_wipe(alias_t *a) {
+ p_delete(&a->name);
+ address_delete(&a->addr);
+ alias_delete(&a->next);
+}
+
+address_t *alias_lookup(alias_t *list, const char *s)
+{
+ while (list) {
+ if (!m_strcasecmp(s, list->name))
+ return list->addr;
+ list = list->next;
+ }
+
+ return NULL;
+}
+
+/* Only characters which are non-special to both the RFC 822 and the mutt
+ configuration parser are permitted. */
+static int alias_sanitize(const char *s, char *d)
{
- ALIAS *t = Aliases;
+ int rv = 0;
+
+ while (*s) {
+ if (isalnum((unsigned char)(*s)) || strchr("-_+=.", *s)) {
+ if (d)
+ *d++ = *s;
+ } else {
+ if (!d)
+ return -1;
+ *d++ = '_';
+ rv = -1;
+ }
+ s++;
+ }
+
+ *d = '\0';
+ return rv;
+}
- for (; t; t = t->next)
- if (!str_casecmp (s, t->name))
- return (t->addr);
- return (NULL); /* no such alias */
+/*
+ * if someone has an address like
+ * From: Michael `/bin/rm -f ~` Elkins <me@mutt.org>
+ * and the user creates an alias for this, Mutt could wind up executing
+ * the backtics because it writes aliases like
+ * alias me Michael `/bin/rm -f ~` Elkins <me@mutt.org>
+ * To avoid this problem, use a backslash (\) to quote any backtics. We also
+ * need to quote backslashes as well, since you could defeat the above by
+ * doing
+ * From: Michael \`/bin/rm -f ~\` Elkins <me@mutt.org>
+ * since that would get aliased as
+ * alias me Michael \\`/bin/rm -f ~\\` Elkins <me@mutt.org>
+ * which still gets evaluated because the double backslash is not a quote.
+ *
+ * Additionally, we need to quote ' and " characters - otherwise, mutt will
+ * interpret them on the wrong parsing step.
+ *
+ * $ wants to be quoted since it may indicate the start of an environment
+ * variable.
+ */
+static void write_safe_address(FILE *fp, const char *s)
+{
+ while (*s) {
+ if (strchr("\\`'\"$", *s)) {
+ fputc('\\', fp);
+ }
+ fputc(*s++, fp);
+ }
+ fputc('\n', fp);
}
-static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
+void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
{
- ADDRESS *head = NULL, *last = NULL, *t, *w;
+ char buf[LONG_STRING], prompt[SHORT_STRING];
+ address_t *adr = iadr;
+ alias_t *new;
+ FILE *rc;
+
+ if (cur) {
+ adr = mutt_get_address(cur, NULL);
+ }
+
+ if (adr && adr->mailbox) {
+ const char *p = m_strchrnul(adr->mailbox, '@');
+ m_strncpy(buf, sizeof(buf), adr->mailbox, p - adr->mailbox);
+ } else {
+ buf[0] = '\0';
+ }
+
+ /* Don't suggest a bad alias name in the event of a strange local part. */
+ alias_sanitize(buf, buf);
+
+ /* add a new alias */
+ if (mutt_get_field(_("Alias as: "), buf, sizeof(buf), 0) || !buf[0])
+ return;
+
+ /* check to see if the user already has an alias defined */
+ if (alias_lookup(Aliases, buf)) {
+ mutt_error _("You already have an alias defined with that name!");
+ return;
+ }
+
+ alias_sanitize(buf, buf);
+ new = alias_new();
+ new->name = m_strdup(buf);
+
+ mutt_addrlist_to_local(adr);
+ if (adr) {
+ m_strcpy(buf, sizeof(buf), adr->mailbox);
+ } else {
+ buf[0] = 0;
+ }
+
+ mutt_addrlist_to_idna(adr, NULL);
+
+ do {
+ const char *err = NULL;
+
+ if (mutt_get_field(_("Address: "), buf, sizeof(buf), 0) || !buf[0]) {
+ alias_delete(&new);
+ return;
+ }
+
+ new->addr = rfc822_parse_adrlist(new->addr, buf);
+ if (!new->addr)
+ BEEP();
+
+ if (mutt_addrlist_to_idna(new->addr, &err)) {
+ mutt_error(_("Error: '%s' is a bad IDN."), err);
+ mutt_sleep(1);
+ continue;
+ }
+ } while (!new->addr);
+
+ if (adr && adr->personal && !mutt_is_mail_list(adr)) {
+ m_strcpy(buf, sizeof(buf), adr->personal);
+ } else {
+ buf[0] = '\0';
+ }
+
+ if (mutt_get_field(_("Personal name: "), buf, sizeof(buf), 0)) {
+ alias_delete(&new);
+ return;
+ }
+ new->addr->personal = m_strdup(buf);
+
+ buf[0] = '\0';
+ rfc822_write_address(buf, sizeof(buf), new->addr, 1);
+ snprintf(prompt, sizeof(prompt), _("[%s = %s] Accept?"), new->name, buf);
+ if (mutt_yesorno(prompt, M_YES) != M_YES) {
+ alias_delete(&new);
+ return;
+ }
+
+ alias_list_push(&Aliases, new);
+
+ m_strcpy(buf, sizeof(buf), NONULL(AliasFile));
+ if (mutt_get_field(_("Save to file: "), buf, sizeof(buf), M_FILE)) {
+ return;
+ }
+
+ mutt_expand_path(buf, sizeof (buf));
+ rc = safe_fopen (buf, "a");
+
+ if (rc) {
+ if (alias_sanitize(new->name, NULL)) {
+ mutt_quote_filename(buf, sizeof(buf), new->name);
+ fprintf(rc, "alias %s ", buf);
+ } else {
+ fprintf(rc, "alias %s ", new->name);
+ }
+
+ buf[0] = '\0';
+ rfc822_write_address(buf, sizeof(buf), new->addr, 0);
+ write_safe_address(rc, buf);
+ fclose(rc);
+ mutt_message _("Alias added.");
+ } else {
+ mutt_perror(buf);
+ }
+}
+
+/************* READ MARK *********************/
+
+
+static address_t *mutt_expand_aliases_r (address_t * a, LIST ** expn)
+{
+ address_t *head = NULL, *last = NULL, *t, *w;
LIST *u;
char i;
const char *fqdn;
while (a) {
if (!a->group && !a->personal && a->mailbox
&& strchr (a->mailbox, '@') == NULL) {
- t = mutt_lookup_alias (a->mailbox);
+ t = alias_lookup(Aliases, a->mailbox);
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
- if (str_cmp (a->mailbox, u->data) == 0) { /* alias already found */
+ if (m_strcmp(a->mailbox, u->data) == 0) { /* alias already found */
debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
u->data = m_strdup(a->mailbox);
u->next = *expn;
*expn = u;
- w = rfc822_cpy_adr (t);
+ w = address_list_dup (t);
w = mutt_expand_aliases_r (w, expn);
if (head)
last->next = w;
t = a;
a = a->next;
t->next = NULL;
- rfc822_free_address (&t);
+ address_delete (&t);
continue;
}
else {
if (pw) {
char namebuf[STRING];
- mutt_gecos_name (namebuf, sizeof (namebuf), pw);
- str_replace (&a->personal, namebuf);
+ mutt_gecos_name(namebuf, sizeof (namebuf), pw, GecosMask.rx);
+ m_strreplace(&a->personal, namebuf);
}
}
}
return (head);
}
-ADDRESS *mutt_expand_aliases (ADDRESS * a)
+address_t *mutt_expand_aliases (address_t * a)
{
- ADDRESS *t;
+ address_t *t;
LIST *expn = NULL; /* previously expanded aliases to avoid loops */
t = mutt_expand_aliases_r (a, &expn);
}
-/*
- * if someone has an address like
- * From: Michael `/bin/rm -f ~` Elkins <me@mutt.org>
- * and the user creates an alias for this, Mutt could wind up executing
- * the backtics because it writes aliases like
- * alias me Michael `/bin/rm -f ~` Elkins <me@mutt.org>
- * To avoid this problem, use a backslash (\) to quote any backtics. We also
- * need to quote backslashes as well, since you could defeat the above by
- * doing
- * From: Michael \`/bin/rm -f ~\` Elkins <me@mutt.org>
- * since that would get aliased as
- * alias me Michael \\`/bin/rm -f ~\\` Elkins <me@mutt.org>
- * which still gets evaluated because the double backslash is not a quote.
- *
- * Additionally, we need to quote ' and " characters - otherwise, mutt will
- * interpret them on the wrong parsing step.
- *
- * $ wants to be quoted since it may indicate the start of an environment
- * variable.
- */
-
-static void write_safe_address (FILE * fp, char *s)
-{
- while (*s) {
- if (*s == '\\' || *s == '`' || *s == '\'' || *s == '"' || *s == '$')
- fputc ('\\', fp);
- fputc (*s, fp);
- s++;
- }
-}
-
-ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
+address_t *mutt_get_address (ENVELOPE * env, const char **pfxp)
{
- ADDRESS *adr;
+ address_t *adr;
const char *pfx = NULL;
if (mutt_addr_is_user (env->from)) {
return adr;
}
-void mutt_create_alias (ENVELOPE * cur, ADDRESS * iadr)
-{
- ALIAS *new, *t;
- char buf[LONG_STRING], prompt[SHORT_STRING], *pc;
- char *err = NULL;
- char fixed[LONG_STRING];
- FILE *rc;
- ADDRESS *adr = NULL;
-
- if (cur) {
- adr = mutt_get_address (cur, NULL);
- }
- else if (iadr) {
- adr = iadr;
- }
-
- if (adr && adr->mailbox) {
- strfcpy (buf, adr->mailbox, sizeof (buf));
- if ((pc = strchr (buf, '@')))
- *pc = 0;
- }
- else
- buf[0] = '\0';
-
- /* Don't suggest a bad alias name in the event of a strange local part. */
- mutt_check_alias_name (buf, buf);
-
-retry_name:
- /* add a new alias */
- if (mutt_get_field (_("Alias as: "), buf, sizeof (buf), 0) != 0 || !buf[0])
- return;
-
- /* check to see if the user already has an alias defined */
- if (mutt_lookup_alias (buf)) {
- mutt_error _("You already have an alias defined with that name!");
-
- return;
- }
-
- if (mutt_check_alias_name (buf, fixed)) {
- switch (mutt_yesorno
- (_("Warning: This alias name may not work. Fix it?"), M_YES)) {
- case M_YES:
- strfcpy (buf, fixed, sizeof (buf));
- goto retry_name;
- case -1:
- return;
- }
- }
-
- new = p_new(ALIAS, 1);
- new->self = new;
- new->name = m_strdup(buf);
-
- mutt_addrlist_to_local (adr);
-
- if (adr)
- strfcpy (buf, adr->mailbox, sizeof (buf));
- else
- buf[0] = 0;
-
- mutt_addrlist_to_idna (adr, NULL);
-
- do {
- if (mutt_get_field (_("Address: "), buf, sizeof (buf), 0) != 0 || !buf[0]) {
- mutt_free_alias (&new);
- return;
- }
-
- if ((new->addr = rfc822_parse_adrlist (new->addr, buf)) == NULL)
- BEEP ();
- if (mutt_addrlist_to_idna (new->addr, &err)) {
- mutt_error (_("Error: '%s' is a bad IDN."), err);
- mutt_sleep (2);
- continue;
- }
- }
- while (new->addr == NULL);
-
- if (adr && adr->personal && !mutt_is_mail_list (adr))
- strfcpy (buf, adr->personal, sizeof (buf));
- else
- buf[0] = 0;
-
- if (mutt_get_field (_("Personal name: "), buf, sizeof (buf), 0) != 0) {
- mutt_free_alias (&new);
- return;
- }
- new->addr->personal = m_strdup(buf);
-
- buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), new->addr, 1);
- snprintf (prompt, sizeof (prompt), _("[%s = %s] Accept?"), new->name, buf);
- if (mutt_yesorno (prompt, M_YES) != M_YES) {
- mutt_free_alias (&new);
- return;
- }
-
- if ((t = Aliases)) {
- while (t->next)
- t = t->next;
- t->next = new;
- }
- else
- Aliases = new;
-
- strfcpy (buf, NONULL (AliasFile), sizeof (buf));
- if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0)
- return;
- mutt_expand_path (buf, sizeof (buf));
- if ((rc = safe_fopen (buf, "a"))) {
- if (mutt_check_alias_name (new->name, NULL))
- mutt_quote_filename (buf, sizeof (buf), new->name);
- else
- strfcpy (buf, new->name, sizeof (buf));
- fprintf (rc, "alias %s ", buf);
- buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), new->addr, 0);
- write_safe_address (rc, buf);
- fputc ('\n', rc);
- fclose (rc);
- mutt_message _("Alias added.");
- }
- else
- mutt_perror (buf);
-}
-
-/*
- * Sanity-check an alias name: Only characters which are non-special to both
- * the RFC 822 and the mutt configuration parser are permitted.
- */
-
-static int check_alias_name_char (char c)
-{
- return (c == '-' || c == '_' || c == '+' || c == '=' || c == '.' ||
- isalnum ((unsigned char) c));
-}
-
-int mutt_check_alias_name (const char *s, char *d)
-{
- int rv = 0;
-
- for (; *s; s++) {
- if (!check_alias_name_char (*s)) {
- if (!d)
- return -1;
- else {
- *d++ = '_';
- rv = -1;
- }
- }
- else if (d)
- *d++ = *s;
- }
- if (d)
- *d++ = *s;
- return rv;
-}
-
/*
* This routine looks to see if the user has an alias defined for the given
* address.
*/
-ADDRESS *alias_reverse_lookup (ADDRESS * a)
+address_t *alias_reverse_lookup (address_t * a)
{
- ALIAS *t = Aliases;
- ADDRESS *ap;
+ alias_t *t = Aliases;
+ address_t *ap;
if (!a || !a->mailbox)
return NULL;
*/
int mutt_alias_complete (char *s, size_t buflen)
{
- ALIAS *a = Aliases;
- ALIAS *a_list = NULL, *a_cur = NULL;
+ alias_t *a = Aliases;
+ alias_t *a_list = NULL, *a_cur = NULL;
char bestname[HUGE_STRING];
int i;
#define min(a,b) ((a<b)?a:b)
if (s[0] != 0) { /* avoid empty string as strstr argument */
- p_clear(bestname, sizeof(bestname));
+ p_clear(bestname, countof(bestname));
while (a) {
if (a->name && strstr (a->name, s) == a->name) {
if (!bestname[0]) /* init */
- strfcpy (bestname, a->name,
- min (m_strlen(a->name) + 1, sizeof (bestname)));
+ m_strcpy(bestname, MIN(m_strlen(a->name) + 1, ssizeof(bestname)),
+ a->name);
else {
for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
bestname[i] = 0;
}
if (bestname[0] != 0) {
- if (str_cmp (bestname, s) != 0) {
+ if (m_strcmp(bestname, s) != 0) {
/* we are adding something to the completion */
- strfcpy (s, bestname, m_strlen(bestname) + 1);
+ m_strcpy(s, m_strlen(bestname) + 1, bestname);
return 1;
}
while (a) {
if (a->name && (strstr (a->name, s) == a->name)) {
if (!a_list) /* init */
- a_cur = a_list = p_new(ALIAS, 1);
+ a_cur = a_list = alias_new();
else {
- a_cur->next = p_new(ALIAS, 1);
+ a_cur->next = alias_new();
a_cur = a_cur->next;
}
- memcpy (a_cur, a, sizeof (ALIAS));
+ *a_cur = *a;
a_cur->next = NULL;
}
a = a->next;
bestname[0] = 0;
mutt_alias_menu (bestname, sizeof (bestname), a_list ? a_list : Aliases);
if (bestname[0] != 0)
- strfcpy (s, bestname, buflen);
+ m_strcpy(s, buflen, bestname);
/* free the alias list */
while (a_list) {
Aliases = a_cur->next;
a_cur->next = NULL;
- mutt_free_alias (&a_cur);
+ alias_delete(&a_cur);
if (a_list)
a_cur = a_list;
}
/* returns TRUE if the given address belongs to the user. */
-int mutt_addr_is_user (ADDRESS * addr)
+int mutt_addr_is_user (address_t * addr)
{
/* NULL address is assumed to be the user. */
if (!addr) {
return 0;
}
-static const char *alias_format_str (char *dest, size_t destlen, char op,
- const char *src, const char *fmt,
- const char *ifstring,
- const char *elsestring,
- unsigned long data, format_flag flags)
+static const format_t *alias_format_str (char *dest, size_t destlen, char op,
+ const format_t *src, const char *fmt,
+ const char *ifstring __attribute__ ((unused)),
+ const char *elsestring __attribute__ ((unused)),
+ unsigned long data, format_flag flags __attribute__ ((unused)))
{
char tmp[SHORT_STRING], adr[SHORT_STRING];
- ALIAS *alias = (ALIAS *) data;
+ alias_t *alias = (alias_t *) data;
switch (op) {
case 'f':
- snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
- snprintf (dest, destlen, tmp, alias->del ? "D" : " ");
+ m_strcpy(dest, destlen, alias->del ? "D" : " ");
break;
case 'a':
- mutt_format_s (dest, destlen, fmt, alias->name);
+ mutt_format_s(dest, destlen, fmt, alias->name);
break;
case 'r':
- adr[0] = 0;
- rfc822_write_address (adr, sizeof (adr), alias->addr, 1);
- snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
- snprintf (dest, destlen, tmp, adr);
+ adr[0] = '\0';
+ rfc822_write_address(adr, sizeof(adr), alias->addr, 1);
+ snprintf(tmp, sizeof(tmp), "%%%ss", fmt);
+ snprintf(dest, destlen, tmp, adr);
break;
case 'n':
- snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
- snprintf (dest, destlen, tmp, alias->num + 1);
+ snprintf(tmp, sizeof(tmp), "%%%sd", fmt);
+ snprintf(dest, destlen, tmp, alias->num + 1);
break;
case 't':
- dest[0] = alias->tagged ? '*' : ' ';
- dest[1] = 0;
+ m_strcpy(dest, destlen, alias->tagged ? "*" : " ");
break;
}
return (src);
}
-static void alias_entry (char *s, size_t slen, MUTTMENU * m, int num)
+static void alias_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
- mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str,
- (unsigned long) ((ALIAS **) m->data)[num],
+ mutt_FormatString (s, slen, NONULL (AliasFmt), (format_t *)alias_format_str,
+ (unsigned long)((alias_t **)m->data)[num],
M_FORMAT_ARROWCURSOR);
}
static int alias_tag (MUTTMENU * menu, int n, int m)
{
- ALIAS *cur = ((ALIAS **) menu->data)[n];
+ alias_t *cur = ((alias_t **) menu->data)[n];
int ot = cur->tagged;
cur->tagged = (m >= 0 ? m : !cur->tagged);
static int alias_SortAlias (const void *a, const void *b)
{
- ALIAS *pa = *(ALIAS **) a;
- ALIAS *pb = *(ALIAS **) b;
- int r = str_casecmp (pa->name, pb->name);
+ alias_t *pa = *(alias_t **) a;
+ alias_t *pb = *(alias_t **) b;
+ int r = m_strcasecmp(pa->name, pb->name);
return (RSORT (r));
}
static int alias_SortAddress (const void *a, const void *b)
{
- ADDRESS *pa = (*(ALIAS **) a)->addr;
- ADDRESS *pb = (*(ALIAS **) b)->addr;
+ address_t *pa = (*(alias_t **) a)->addr;
+ address_t *pb = (*(alias_t **) b)->addr;
int r;
if (pa == pb)
r = 1;
else if (pa->personal) {
if (pb->personal)
- r = str_casecmp (pa->personal, pb->personal);
+ r = m_strcasecmp(pa->personal, pb->personal);
else
r = 1;
}
return (RSORT (r));
}
-void mutt_alias_menu (char *buf, size_t buflen, ALIAS * aliases)
+void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)
{
- ALIAS *aliasp;
+ alias_t *aliasp;
MUTTMENU *menu;
- ALIAS **AliasTable = NULL;
+ alias_t **AliasTable = NULL;
int t = -1;
int i, done = 0;
int op;
menu->tag = alias_tag;
menu->menu = MENU_ALIAS;
menu->title = _("Aliases");
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_ALIAS, AliasHelp);
+ menu->help = mutt_compile_help(helpstr, sizeof(helpstr),
+ MENU_ALIAS, AliasHelp);
new_aliases:
/* count the number of aliases */
for (aliasp = aliases; aliasp; aliasp = aliasp->next) {
- aliasp->self->del = 0;
- aliasp->self->tagged = 0;
+ aliasp->del = 0;
+ aliasp->tagged = 0;
menu->max++;
}
menu->data = AliasTable;
for (i = omax, aliasp = aliases; aliasp; aliasp = aliasp->next, i++) {
- AliasTable[i] = aliasp->self;
+ AliasTable[i] = aliasp;
aliases = aliasp;
}
if ((SortAlias & SORT_MASK) != SORT_ORDER) {
- qsort (AliasTable, i, sizeof (ALIAS *),
+ qsort (AliasTable, i, sizeof (alias_t *),
(SortAlias & SORT_MASK) ==
SORT_ADDRESS ? alias_SortAddress : alias_SortAlias);
}
menu->redraw |= REDRAW_INDEX;
}
else {
- AliasTable[menu->current]->self->del = (op == OP_DELETE) ? 1 : 0;
+ AliasTable[menu->current]->del = (op == OP_DELETE) ? 1 : 0;
menu->redraw |= REDRAW_CURRENT;
if (option (OPTRESOLVE) && menu->current < menu->max - 1) {
menu->current++;