+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * Copyright © 2006 Pierre Habouzit
+ */
/*
* Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <ctype.h>
-
-#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-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
-#include "mutt.h"
+#include "alias.h"
#include "mutt_idna.h"
#include "sort.h"
+char *AliasFmt;
+char *AliasFile;
+alias_t *Aliases;
+rx_t GecosMask;
+
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
static struct mapping_t AliasHelp[] = {
{NULL, OP_NULL}
};
-const address_t *alias_lookup(const alias_t *list, const char *s)
+static void mutt_alias_menu(char *, size_t, alias_t *);
+
+const address_t *alias_lookup(const char *s)
{
- while (list) {
+ alias_t *list;
+
+ for (list = Aliases; list; list = list->next) {
if (!m_strcasecmp(s, list->name))
return list->addr;
- list = list->next;
+ }
+
+ return NULL;
+}
+
+/* This routine looks to see if the user has an alias defined for the given
+ address. */
+const address_t *alias_reverse_lookup(const address_t *a)
+{
+ alias_t *list;
+
+ if (!a || !a->mailbox)
+ return NULL;
+
+ for (list = Aliases; list; list = list->next) {
+ address_t *ap;
+
+ /* cycle through all addresses if this is a group alias */
+ for (ap = list->addr; ap; ap = ap->next) {
+ if (!ap->group && ap->mailbox
+ && !ascii_strcasecmp(ap->mailbox, a->mailbox))
+ return ap;
+ }
}
return NULL;
s++;
}
- *d = '\0';
+ if (d)
+ *d = '\0';
return rv;
}
void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
{
- char buf[LONG_STRING], prompt[SHORT_STRING];
+ char buf[LONG_STRING], prompt[STRING];
address_t *adr = iadr;
alias_t *new;
FILE *rc;
return;
/* check to see if the user already has an alias defined */
- if (alias_lookup(Aliases, buf)) {
+ if (alias_lookup(buf)) {
mutt_error _("You already have an alias defined with that name!");
return;
}
mutt_addrlist_to_idna(adr, NULL);
do {
- const char *err = NULL;
+ char *err = NULL;
if (mutt_get_field(_("Address: "), buf, sizeof(buf), 0) || !buf[0]) {
alias_list_wipe(&new);
if (mutt_addrlist_to_idna(new->addr, &err)) {
mutt_error(_("Error: '%s' is a bad IDN."), err);
+ p_delete(&err);
mutt_sleep(1);
continue;
}
new->addr->personal = m_strdup(buf);
buf[0] = '\0';
- rfc822_write_address(buf, sizeof(buf), new->addr, 1);
+ rfc822_addrcat(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_list_wipe(&new);
}
buf[0] = '\0';
- rfc822_write_address(buf, sizeof(buf), new->addr, 0);
+ rfc822_addrcat(buf, sizeof(buf), new->addr, 0);
write_safe_address(rc, buf);
- fclose(rc);
+ m_fclose(&rc);
mutt_message _("Alias added.");
} else {
mutt_perror(buf);
if (!pop->group && !pop->personal
&& pop->mailbox && !strchr(pop->mailbox, '@'))
{
- const address_t *t = alias_lookup(Aliases, pop->mailbox);
+ const address_t *t = alias_lookup(pop->mailbox);
if (t) {
string_list_t *u;
if (option(OPTUSEDOMAIN)) {
/* now qualify all local addresses */
- const char *fqdn = mutt_fqdn(1);
- if (fqdn)
- rfc822_qualify(head, fqdn);
+ rfc822_qualify(head, mutt_fqdn(1));
}
return head;
t = mutt_expand_aliases_r(a, &expn);
string_list_wipe(&expn);
- return mutt_remove_duplicates(t);
+ address_list_uniq(t);
+ return t;
}
void mutt_expand_aliases_env(ENVELOPE *env)
/************* READ MARK *********************/
-
-/*
- * This routine looks to see if the user has an alias defined for the given
- * address.
- */
-address_t *alias_reverse_lookup (address_t * a)
-{
- alias_t *t = Aliases;
- address_t *ap;
-
- if (!a || !a->mailbox)
- return NULL;
-
- for (; t; t = t->next) {
- /* cycle through all addresses if this is a group alias */
- for (ap = t->addr; ap; ap = ap->next) {
- if (!ap->group && ap->mailbox &&
- ascii_strcasecmp (ap->mailbox, a->mailbox) == 0)
- return ap;
- }
- }
- return 0;
-}
-
/* alias_complete() -- alias completion routine
*
* given a partial alias, this routine attempts to fill in the alias
return 0;
}
-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)))
+static const char *
+alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
+ const char *fmt, const char *ifstr __attribute__ ((unused)),
+ const char *elstr __attribute__ ((unused)),
+ anytype data, format_flag flags __attribute__ ((unused)))
{
- char tmp[SHORT_STRING], adr[SHORT_STRING];
- alias_t *alias = (alias_t *) data;
+ char tmp[STRING], adr[STRING];
+ alias_t *alias = data.ptr;
switch (op) {
case 'f':
- m_strcpy(dest, destlen, alias->del ? "D" : " ");
+ m_strputc(dest, destlen, alias->del ? 'D' : ' ');
break;
case 'a':
mutt_format_s(dest, destlen, fmt, alias->name);
break;
case 'r':
adr[0] = '\0';
- rfc822_write_address(adr, sizeof(adr), alias->addr, 1);
+ rfc822_addrcat(adr, sizeof(adr), alias->addr, 1);
snprintf(tmp, sizeof(tmp), "%%%ss", fmt);
snprintf(dest, destlen, tmp, adr);
break;
snprintf(dest, destlen, tmp, alias->num + 1);
break;
case 't':
- m_strcpy(dest, destlen, alias->tagged ? "*" : " ");
+ m_strputc(dest, destlen, alias->tagged ? '*' : ' ');
break;
}
- return (src);
+ return src;
}
-static void alias_entry (char *s, ssize_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), (format_t *)alias_format_str,
- (unsigned long)((alias_t **)m->data)[num],
- M_FORMAT_ARROWCURSOR);
+ m_strformat(s, slen, COLS - SW, AliasFmt, alias_format_str,
+ ((alias_t **)m->data)[num],
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static int alias_tag (MUTTMENU * menu, int n, int m)
int t = -1;
int i, done = 0;
int op;
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
int omax;
for (i = 0; i < menu->max; i++) {
if (AliasTable[i]->tagged) {
mutt_addrlist_to_local (AliasTable[i]->addr);
- rfc822_write_address (buf, buflen, AliasTable[i]->addr, 0);
+ rfc822_addrcat(buf, buflen, AliasTable[i]->addr, 0);
t = -1;
}
}
if (t != -1) {
mutt_addrlist_to_local (AliasTable[t]->addr);
- rfc822_write_address (buf, buflen, AliasTable[t]->addr, 0);
+ rfc822_addrcat(buf, buflen, AliasTable[t]->addr, 0);
}
mutt_menuDestroy (&menu);
p_delete(&AliasTable);
-
}
projects / apps / madmutt.git / blobdiff