# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/url.h>
-
+#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
#include "mutt.h"
#ifndef _MUTT_ACCOUNT_H_
#define _MUTT_ACCOUNT_H_ 1
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
/* account types */
enum {
#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/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
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)
#ifndef _MUTT_ALIAS_H
#define _MUTT_ALIAS_H
-#include <lib-lib/list.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
typedef struct alias_t {
#include <string.h>
#include <errno.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/lib-lib.h>
#include <lib-sys/unix.h>
#include <pwd.h>
#include <grp.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <unistd.h>
#include <stdio.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/sidebar.h>
CFLAGS += -Wredundant-decls
# warn if the format string is not a string literal
#CFLAGS += -Wformat-nonliteral
+# missing prototypes
+CFLAGS += -Wmissing-prototypes
# include <langinfo.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "charset.h"
#include <sys/types.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <unistd.h>
#include <stdlib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <unistd.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/mutt_signal.h>
#include <lib-sys/unix.h>
#include <ctype.h>
#include <unistd.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
extern int snprintf (char *, size_t, const char *, ...);
# endif
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
static int DotlockFlags;
static int Retry = MAXLOCKATTEMPT;
# include "config.h"
#endif
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "copy.h"
# include "config.h"
#endif
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <ctype.h>
#include <string.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#ifndef _GLOBALS_H
#define _GLOBALS_H
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include "lib/list.h"
#include <sys/wait.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <sys/time.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
#include <lib-mime/mime.h>
#include <string.h>
#include <ctype.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
#include <ctype.h>
#include <string.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
wc = CharsetReplacement;
}
/* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
- if (IsWPrint (wc) && (w = wcwidth (wc)) >= 0) {
+ if (iswprint(wc) && (w = wcwidth (wc)) >= 0) {
if (w > n)
break;
n -= w;
#include <ctype.h>
#include <unistd.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/file.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "imap_private.h"
#include "imap_private.h"
#include "auth.h"
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
/* this is basically a stripped-down version of the cram-md5 method. */
imap_auth_res_t imap_auth_anon (IMAP_DATA * idata, const char *method __attribute__ ((unused)))
#define MD5_BLOCK_LEN 64
#define MD5_DIGEST_LEN 16
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
/* forward declarations */
#ifdef USE_GSS
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <netinet/in.h>
# include "config.h"
#endif
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "imap_private.h"
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
-#include <lib-lib/macros.h>
-
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
#include <stdlib.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "message.h"
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/buffer.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mx.h"
#endif
#include "buffy.h"
-#include <lib-lib/macros.h>
-
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
/* imap forward declarations */
static int imap_get_delim (IMAP_DATA * idata);
static char *imap_get_flags (string_list_t ** hflags, char *s);
#include <stdlib.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/buffer.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include "pgp.h"
#endif
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
#if HAVE_STDINT_H
#include <stdint.h>
#elif HAVE_INTTYPES_H
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "imap_private.h"
#include "mx.h"
#include "mx_imap.h"
-
-
int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
url_scheme_t s;
if (!path || !*path)
# include "config.h"
#endif
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "charset.h"
#include "config.h"
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mx.h" /* for M_IMAP */
#include "imap_private.h"
#include <lib-sys/mutt_ssl.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <sys/wait.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_ssl.h>
CurrentMenu = MENU_MAIN;
- /* Do we have a locale definition? */
- if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
- ((p = getenv ("LANG")) != NULL && p[0]) ||
- ((p = getenv ("LC_CTYPE")) != NULL && p[0]))
- set_option (OPTLOCALES);
-
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
if (getsid (0) == getpid ())
mutt_init_history ();
-
-
-
- /*
- *
- * 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/.madmuttrc-%s", NONULL (Homedir),
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
}
else if (c >= KEY_F0 && c < KEY_F (256)) /* this maximum is just a guess */
sprintf (buf, "<F%d>", c - KEY_F0);
- else if (IsPrint (c))
+ else if (isprint((unsigned char)c))
snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
else
snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
#ifndef KEYMAP_H
#define KEYMAP_H
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
/* maximal length of a key binding sequence used for buffer in km_bindkey */
#define MAX_SEQ 8
#include <gpgme.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
if (fqdn)
rfc822_qualify (tmp, fqdn);
- tmp = mutt_remove_duplicates (tmp);
+ address_list_uniq(tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
# include "config.h"
#endif
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "crypt-mod.h"
# include <sys/resource.h>
#endif
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
# include "config.h"
#endif
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "crypt.h"
#include <time.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "pgp.h"
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
if (fqdn)
rfc822_qualify (tmp, fqdn);
- tmp = mutt_remove_duplicates (tmp);
+ address_list_uniq(&tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
#include <fcntl.h>
#include <time.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <unistd.h>
#include <time.h>
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "lib.h"
#include <string.h>
#include <ctype.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include <lib-mime/mime.h>
#include <unistd.h>
#include <time.h>
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
#include "lib.h"
# include <sys/resource.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
if (fqdn)
rfc822_qualify (tmp, fqdn);
- tmp = mutt_remove_duplicates (tmp);
+ address_list_uniq(&tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES = mem.h str.h ascii.h buffer.h hash.h list.h file.h mapping.h \
- str.c ascii.c buffer.c hash.c list.c file.c mapping.c \
+liblib_a_SOURCES = lib-lib.h mem.h macros.h \
+ str.h ascii.h buffer.h hash.h list.h file.h mapping.h \
+ str.c ascii.c buffer.c hash.c list.c file.c mapping.c \
\
date.h rx.h url.h \
date.c rx.c url.c
-noinst_HEADERS = mem.h str.h ascii.h buffer.h hash.h list.h file.h mapping.h \
+noinst_HEADERS = lib-lib.h mem.h macros.h \
+ str.h ascii.h buffer.h hash.h list.h file.h mapping.h \
date.h rx.h url.h
-include ../cflags.mk
#include "buffer.h"
#include "file.h"
-#include "mutt.h"
-
/*
* Creates and initializes a BUFFER*. If passed an existing BUFFER*,
* just initializes. Frees anything already in the buffer.
*buf->dptr = '\0';
}
-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;
-
- tok->dptr = vskipspaces(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,
- (ascii_toupper(*tok->dptr) - 'A' + 1) & 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, ascii_toupper(ch) - 'A' + 1);
- } else {
- mutt_buffer_addch(dest, '^');
- mutt_buffer_addch(dest, ch);
- }
- } else
- if (ch == '`' && (!qc || qc == '"')) {
- FILE *fp;
- pid_t pid;
- char *cmd, *ptr;
- ssize_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) {
- return (-1);
- }
-
- cmd = p_dupstr(tok->dptr, pc - tok->dptr);
- if ((pid = mutt_create_filter(cmd, NULL, &fp, NULL)) < 0) {
- p_delete(&cmd);
- return -1;
- }
- p_delete(&cmd);
-
- tok->dptr = pc + 1;
-
- /* read line */
- p_clear(&expn, 1);
- 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);
- p_delete(&expn.data);
- } else
- if (expn.data) {
- expnlen = m_strlen(expn.data);
- tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
- ptr = xmalloc(tok->dsize);
- memcpy(ptr, expn.data, expnlen);
- strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
- if (tok->destroy)
- p_delete(&tok->data);
- tok->data = ptr;
- tok->dptr = ptr;
- tok->destroy = 1; /* mark that the caller should destroy this data */
- ptr = NULL;
- p_delete(&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 = p_dupstr(tok->dptr, pc - tok->dptr);
- tok->dptr = pc + 1;
- }
- } else {
- for (pc = tok->dptr; isalnum((unsigned char)*pc) || *pc == '_';
- pc++);
- var = p_dupstr(tok->dptr, pc - tok->dptr);
- tok->dptr = pc;
- }
- if (var) {
- char tmp[STRING];
- if ((env = getenv (var))
- || (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
- {
- mutt_buffer_addstr (dest, env);
- }
- }
- p_delete(&var);
- } else {
- mutt_buffer_addch(dest, ch);
- }
- }
- mutt_buffer_addch(dest, 0); /* terminate the string */
- tok->dptr = vskipspaces(tok->dptr);
- return 0;
-}
-
#ifndef MUTT_LIB_LIB_BUFFER_H
#define MUTT_LIB_LIB_BUFFER_H
-#include <lib-lib/str.h>
-
-/* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL 1 /* treat '=' as a special */
-#define M_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE (1<<3) /* don't interpret quotes */
-#define M_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
-#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
-
+#include "str.h"
typedef struct {
char *data; /* pointer to data */
void mutt_buffer_free(BUFFER **);
BUFFER *mutt_buffer_from(BUFFER *, const char *);
-int mutt_extract_token(BUFFER *, BUFFER *, int);
-
void mutt_buffer_add(BUFFER *, const char *, ssize_t);
static inline void mutt_buffer_addstr(BUFFER *b, const char *s) {
mutt_buffer_add(b, s, m_strlen(s));
--- /dev/null
+/*
+ * 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
+ */
+
+#ifndef MUTT_LIB_LIB_LIB_LIB_H
+#define MUTT_LIB_LIB_LIB_LIB_H
+
+#include "macros.h"
+#include "mem.h"
+
+#include "ascii.h"
+#include "buffer.h"
+#include "date.h"
+#include "file.h"
+#include "hash.h"
+#include "list.h"
+#include "mapping.h"
+#include "rx.h"
+#include "str.h"
+#include "url.h"
+
+#endif
#include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
rx_t *rx_compile(const char *s, int flags)
{
# include "config.h"
#endif
+#include <stdio.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mapping.h>
-#include <lib-lib/url.h>
-
-#include <lib-mime/mime.h>
-
-#include "mutt.h"
+#include <lib-lib/lib-lib.h>
static struct mapping_t UrlMap[] = {
{"file", U_FILE},
* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include <lib-crypt/crypt.h>
#ifndef MUTT_LIB_MIME_MIME_TYPES_H
#define MUTT_LIB_MIME_MIME_TYPES_H
-#include <lib-lib/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/list.h>
+#include <lib-lib/lib-lib.h>
/* Content-Type */
enum {
* Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
*/
-#include <lib-lib/ascii.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mime.h"
int mutt_is_application_pgp(BODY *);
int mutt_is_application_smime(BODY *);
int mutt_is_text_part(BODY *);
+time_t mutt_parse_date(const char *, HEADER *);
/*** addresses ***/
address_t *mutt_parse_adrlist(address_t *, const char *);
address_t *address_dup(const address_t *addr);
address_t *address_list_dup(const address_t *addr);
+
+void address_list_uniq(address_t *);
void rfc822_qualify(address_t *, const char *);
address_t *rfc822_parse_adrlist(address_t *, const char *s);
#include <errno.h>
#include <unistd.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
}
-void _rfc2047_encode_string(char **pd, int encode_specials, int col)
+static void _rfc2047_encode_string(char **pd, int encode_specials, int col)
{
char *e;
ssize_t elen;
#include <string.h>
#include <stdlib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include "state.h"
+#include "rfc3676.h"
#define FLOWED_MAX 77
#include <ctype.h>
#include <stdlib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt_idna.h"
return res;
}
+/* given a list of addresses, return a list of unique addresses */
+void address_list_uniq(address_t *a)
+{
+ for (; a; a = a->next) {
+ address_t **b = &a->next;
+
+ if (!a->mailbox)
+ continue;
+
+ while (*b) {
+ if ((*b)->mailbox && !ascii_strcasecmp((*b)->mailbox, a->mailbox))
+ {
+ address_t *pop = address_list_pop(b);
+ address_delete(&pop);
+ } else {
+ b = &(*b)->next;
+ }
+ }
+ }
+}
/****************************************************************************/
/* Parsing functions */
return s;
}
-address_t **rfc822_eotoken(address_t **last, static_buf *phrase, static_buf *comment)
+static address_t **rfc822_eotoken(address_t **last, static_buf *phrase, static_buf *comment)
{
if (phrase->len) {
const char *s;
#include <stdio.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/date.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "recvattach.h"
#define EX_OK 0
#endif
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "exit.h"
#include <sys/wait.h>
#include <stdio.h>
+#include <lib-lib/lib-lib.h>
+
#include "mutt_signal.h"
#include "unix.h"
return rc;
}
+
+/* This function allows the user to specify a command to read stdout from in
+ place of a normal file. If the last character in the string is a pipe (|),
+ then we assume it is a commmand to run instead of a normal file. */
+FILE *mutt_open_read (const char *path, pid_t * thepid)
+{
+ int len = m_strlen(path);
+ FILE *f;
+
+ if (path[len - 1] == '|') {
+ char *s = m_strdup(path);
+
+ /* read from a pipe */
+
+ s[len - 1] = 0;
+ mutt_endwin (NULL);
+ *thepid = mutt_create_filter (s, NULL, &f, NULL);
+ p_delete(&s);
+ } else {
+ f = fopen (path, "r");
+ if (!f)
+ return NULL;
+ *thepid = -1;
+ }
+
+ return (f);
+}
+
#include <sys/wait.h>
#include <errno.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <string.h>
#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "globals.h"
#include <string.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <gnutls/openssl.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <fcntl.h>
#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include <sys/wait.h>
#include <unistd.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include "unix.h"
#include "mutt_signal.h"
#include <sys/types.h>
#include <pwd.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
ssize_t mutt_gecos_name(char *dst, ssize_t n, struct passwd *pw, regex_t *rx);
int getdnsdomainname(char *, ssize_t);
int, int);
int mutt_wait_filter (pid_t);
+FILE *mutt_open_read (const char *, pid_t *);
#endif /* MUTT_LIB_SYS_UNIX_H */
#include <stdlib.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include "curses.h"
#include <sys/stat.h>
#include <errno.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mx.h"
#include <langinfo.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
}
k = (k == -1) ? 1 : len;
wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
k = (k == -1) ? 1 : n;
wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w += wcwidth (wc);
}
#include <sys/stat.h>
#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/sidebar.h>
} progress_t;
void mutt_progress_bar (progress_t* progress, long pos);
+void mutt_clear_error (void);
+void mutt_edit_file (const char *, const char *);
+void mutt_curses_error (const char *, ...);
+void mutt_curses_message (const char *, ...);
+void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
+ ssize_t, int);
+void mutt_format_s (char *, ssize_t, const char *, const char *);
+void mutt_format_s_tree (char *, ssize_t, const char *, const char *);
+void mutt_free_color (int fg, int bg);
+void mutt_paddstr (int, const char *);
+#define mutt_perror(a) _mutt_perror (a, __FILE__, __LINE__)
+void _mutt_perror (const char*, const char*,int);
+void mutt_query_exit (void);
+void mutt_query_menu (char *, ssize_t);
+void mutt_show_error (void);
+
+int mutt_addwch (wchar_t);
+int mutt_alloc_color (int fg, int bg);
+int mutt_any_key_to_continue (const char *);
+int mutt_complete (char *, ssize_t);
+#define mutt_enter_fname(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL)
+int _mutt_enter_fname (const char *, char *, ssize_t, int *, int, int,
+ char ***, int *);
+
+#define mutt_get_field(A,B,C,D) _mutt_get_field(A,B,C,D,0,NULL,NULL)
+int _mutt_get_field (const char *, char *, ssize_t, int, int, char ***, int *);
+int mutt_get_field_unbuffered (char *, char *, ssize_t, int);
+int mutt_index_menu (void);
+int mutt_is_mail_list (address_t *);
+int mutt_is_subscribed_list (address_t *);
+int mutt_multi_choice (char *prompt, char *letters);
+int mutt_parse_color (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+int mutt_parse_uncolor (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+int mutt_parse_mono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+int mutt_parse_unmono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+int mutt_query_complete (char *, ssize_t);
+int mutt_strwidth (const char *);
+int mutt_user_is_recipient (HEADER *);
+int mutt_yesorno (const char *, int);
+void mutt_set_header_color (CONTEXT *, HEADER *);
extern int *ColorQuote;
extern int ColorQuoteUsed;
void ci_init_color (void);
void ci_start_color (void);
+#define mutt_make_string(A,B,C,D,E) _mutt_make_string(A,B,C,D,E,0)
+void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
+ HEADER *, format_flag);
+
+
#define SETCOLOR(X) attrset(ColorDefs[X])
#define ADDCOLOR(X) attron(ColorDefs[X])
#include <wctype.h>
#include <wchar.h>
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "curses.h"
#include "enter.h"
{
int n = wcwidth (wc);
- if (IsWPrint (wc) && n > 0)
+ if (iswprint(wc) && n > 0)
return n;
if (!(wc & ~0x7f))
return 2;
}
/* combining mark / non-spacing character */
-#define COMB_CHAR(wc) (IsWPrint (wc) && !wcwidth (wc))
+#define COMB_CHAR(wc) (iswprint(wc) && !wcwidth(wc))
static int my_wcswidth (const wchar_t * s, size_t n)
{
{
int n = wcwidth (wc);
- if (IsWPrint (wc) && n > 0)
+ if (iswprint(wc) && n > 0)
return mutt_addwch (wc);
if (!(wc & ~0x7f))
return printw ("^%c", ((int) wc + 0x40) & 0x7f);
if (first && (flags & M_CLEAR)) {
first = 0;
- if (IsWPrint (wc)) /* why? */
+ if (iswprint(wc)) /* why? */
state->curpos = state->lastchar = 0;
}
rv = 0;
goto bye;
}
- else if (wc && (wc < ' ' || IsWPrint (wc))) { /* why? */
+ else if (wc && (wc < ' ' || iswprint(wc))) { /* why? */
if (state->lastchar >= state->wbuflen) {
state->wbuflen = state->lastchar + 20;
p_realloc(&state->wbuf, state->wbuflen);
#include <string.h>
#include <locale.h>
-#include <lib-lib/rx.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "history.h"
#include <stdlib.h>
#include <wchar.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "curses.h"
#include "enter.h"
* This file is named mutt_menu.h so it doesn't collide with ncurses menu.h
*/
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include "keymap.h"
#include <stdlib.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-sys/unix.h>
#include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
QueryTable[i].data = queryp;
}
else {
- int clear = 0;
+ int doclear = 0;
/* append */
p_realloc(&QueryTable, menu->max);
queryp = queryp->next, i++) {
/* once we hit new entries, clear/init the tag */
if (queryp == newresults)
- clear = 1;
+ doclear = 1;
QueryTable[i].data = queryp;
- if (clear)
+ if (doclear)
QueryTable[i].tagged = 0;
}
}
#include <libgen.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <stddef.h>
#include <string.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include "list.h"
#include <sys/stat.h>
#include <sys/utsname.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/mutt_signal.h>
#include <ctype.h>
#include <errno.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#include <unistd.h>
#include <fcntl.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include <lib-sys/mutt_signal.h>
#include <sys/time.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mx.h"
/* XXX - we don't currently remove deleted messages from sequences we don't know. Should we? */
-void mh_update_sequences (CONTEXT * ctx)
+static void mh_update_sequences (CONTEXT * ctx)
{
FILE *ofp, *nfp;
* This function does the second parsing pass for a maildir-style
* folder.
*/
-void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
+static void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
{
struct maildir *p;
char fn[_POSIX_PATH_MAX];
return mh_mkstemp (dest, &msg->fp, &msg->path);
}
-int ch_compar (const void *a, const void *b)
+static int ch_compar (const void *a, const void *b)
{
return (int) (*((const char *) a) - *((const char *) b));
}
* then again, it's called rarely.
*/
-FILE *_maildir_open_find_message (const char *folder, const char *unique,
- const char *subfolder)
+static FILE *_maildir_open_find_message (const char *folder, const char *unique,
+ const char *subfolder)
{
char dir[_POSIX_PATH_MAX];
char tunique[_POSIX_PATH_MAX];
* 0 if there are messages in the mailbox
* -1 on error
*/
-int mh_check_empty (const char *path)
+static int mh_check_empty (const char *path)
{
DIR *dp;
struct dirent *de;
int mh_buffy (const char *);
FILE *maildir_open_find_message (const char *, const char *);
+int mh_valid_message (const char *);
/* these are the only publicly visible for usage */
#include <posix1_lim.h>
#endif
-#include <lib-lib/buffer.h>
-#include <lib-lib/hash.h>
-#include <lib-lib/list.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
OPTAUXSORT, /* (pseudo) using auxillary sort function */
OPTFORCEREFRESH, /* (pseudo) refresh even during macros */
- OPTLOCALES, /* (pseudo) set if user has valid locale definition */
OPTNOCURSES, /* (pseudo) when sending in batch mode */
OPTNEEDREDRAW, /* (pseudo) to notify caller of a submenu */
OPTSEARCHREVERSE, /* (pseudo) used by ci_search_command */
#include <idna.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "charset.h"
#include <stdarg.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
#include "mutt.h"
#include "account.h"
#include "mutt_sasl.h"
-#include <lib-sys/mutt_socket.h>
static int getnameinfo_err (int ret)
{
#include <unistd.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
mutt_save_path(s, l, a);
while (*s) {
- if (*s == '/' || ISSPACE(*s) || !IsPrint((unsigned char)*s))
+ if (*s == '/' || ISSPACE(*s) || !isprint((unsigned char)*s))
*s = '_';
s++;
}
/* Make sure that the string is printable by changing all non-printable
chars to dots, or spaces for non-printable whitespace */
for (cp = dest; *cp; cp++)
- if (!IsPrint (*cp) && !((flags & M_FORMAT_TREE) && (*cp <= M_TREE_MAX)))
+ if (!isprint(*cp) && !((flags & M_FORMAT_TREE) && (*cp <= M_TREE_MAX)))
*cp = isspace ((unsigned char) *cp) ? ' ' : '.';
}
#endif
}
-/* This function allows the user to specify a command to read stdout from in
- place of a normal file. If the last character in the string is a pipe (|),
- then we assume it is a commmand to run instead of a normal file. */
-FILE *mutt_open_read (const char *path, pid_t * thepid)
-{
- int len = m_strlen(path);
- FILE *f;
-
- if (path[len - 1] == '|') {
- char *s = m_strdup(path);
-
- /* read from a pipe */
-
- s[len - 1] = 0;
- mutt_endwin (NULL);
- *thepid = mutt_create_filter (s, NULL, &f, NULL);
- p_delete(&s);
- } else {
- f = fopen (path, "r");
- if (!f)
- return NULL;
- *thepid = -1;
- }
-
- return (f);
-}
-
/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
int mutt_save_confirm (const char *s, struct stat *st)
{
return (0);
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;
+
+ tok->dptr = vskipspaces(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,
+ (ascii_toupper(*tok->dptr) - 'A' + 1) & 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, ascii_toupper(ch) - 'A' + 1);
+ } else {
+ mutt_buffer_addch(dest, '^');
+ mutt_buffer_addch(dest, ch);
+ }
+ } else
+ if (ch == '`' && (!qc || qc == '"')) {
+ FILE *fp;
+ pid_t pid;
+ char *cmd, *ptr;
+ ssize_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) {
+ return (-1);
+ }
+
+ cmd = p_dupstr(tok->dptr, pc - tok->dptr);
+ if ((pid = mutt_create_filter(cmd, NULL, &fp, NULL)) < 0) {
+ p_delete(&cmd);
+ return -1;
+ }
+ p_delete(&cmd);
+
+ tok->dptr = pc + 1;
+
+ /* read line */
+ p_clear(&expn, 1);
+ 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);
+ p_delete(&expn.data);
+ } else
+ if (expn.data) {
+ expnlen = m_strlen(expn.data);
+ tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
+ ptr = xmalloc(tok->dsize);
+ memcpy(ptr, expn.data, expnlen);
+ strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
+ if (tok->destroy)
+ p_delete(&tok->data);
+ tok->data = ptr;
+ tok->dptr = ptr;
+ tok->destroy = 1; /* mark that the caller should destroy this data */
+ ptr = NULL;
+ p_delete(&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 = p_dupstr(tok->dptr, pc - tok->dptr);
+ tok->dptr = pc + 1;
+ }
+ } else {
+ for (pc = tok->dptr; isalnum((unsigned char)*pc) || *pc == '_';
+ pc++);
+ var = p_dupstr(tok->dptr, pc - tok->dptr);
+ tok->dptr = pc;
+ }
+ if (var) {
+ char tmp[STRING];
+ if ((env = getenv (var))
+ || (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
+ {
+ mutt_buffer_addstr (dest, env);
+ }
+ }
+ p_delete(&var);
+ } else {
+ mutt_buffer_addch(dest, ch);
+ }
+ }
+ mutt_buffer_addch(dest, 0); /* terminate the string */
+ tok->dptr = vskipspaces(tok->dptr);
+ return 0;
+}
#include <ctype.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
int mx_unlock_file (const char *path, int fd, int dot);
int mx_rebuild_cache (void);
+void mutt_parse_mime_message (CONTEXT * ctx, HEADER *);
#endif /* !_MX_H */
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "nntp.h"
#include <libgen.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <ctype.h>
#include <stdlib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <string.h>
#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mapping.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
/* Handle backspace */
special = 0;
- if (IsWPrint (wc)) {
+ if (iswprint(wc)) {
wchar_t wc1;
mbstate_t mbstate1;
int k1, k2;
&mbstate1), k1 - k > 0 && wc1 == '\b')
&& (wc1 = 0, k2 =
mbrtowc (&wc1, (char *) buf + ch + k1, cnt - ch - k1,
- &mbstate1), k2 > 0 && IsWPrint (wc1))) {
+ &mbstate1), k2 > 0 && iswprint(wc1))) {
if (wc == wc1) {
special |= (wc == '_' && special & A_UNDERLINE)
? A_UNDERLINE : A_BOLD;
last_special = special;
}
- if (IsWPrint (wc)) {
+ if (iswprint(wc)) {
if (wc == ' ')
space = ch;
t = wcwidth (wc);
#include <unistd.h>
#include <stdarg.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
#define M_PDR_ERROR 0x0100
#define M_PDR_ERRORDONE (M_PDR_ERROR | M_PDR_DONE)
-
-int mutt_getvaluebychar (char ch, struct mapping_t *table)
-{
- int i;
-
- for (i = 0; table[i].name; i++) {
- if (ch == table[i].name[0])
- return table[i].value;
- }
-
- return (-1);
-}
-
/* if no uppercase letters are given, do a case-insensitive search */
int mutt_which_case (const char *s)
{
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
#include <stdio.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "pop.h"
#include <string.h>
#include <unistd.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
#include "mutt.h"
#include <unistd.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mx.h"
#include <string.h>
#include <sys/stat.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <inttypes.h>
#endif
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
-
#define MoreArgs(p) (*p->dptr && *p->dptr != ';' && *p->dptr != '#')
-#define mutt_make_string(A,B,C,D,E) _mutt_make_string(A,B,C,D,E,0)
-void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
- HEADER *, format_flag);
-
-#define mutt_new_enter_state() p_new(ENTER_STATE, 1)
-
typedef const char *format_t (char *, ssize_t, char, const char *,
const char *, const char *, const char *,
unsigned long, format_flag);
void mutt_FormatString (char *, ssize_t, const char *, format_t *,
unsigned long, format_flag);
-FILE *mutt_open_read (const char *, pid_t *);
void set_quadoption (int, int);
int query_quadoption (int, const char *);
int mutt_option_value (const char* val, char* dst, ssize_t dstlen);
address_t *mutt_default_from (void);
-address_t *mutt_remove_duplicates (address_t *);
BODY *mutt_make_file_attach (const char *);
BODY *mutt_make_message_attach (CONTEXT *, HEADER *, int);
CONTENT *mutt_get_content_info (const char *fname, BODY * b);
-string_list_t *mutt_make_references (ENVELOPE * e);
-
int mutt_cmp_header (const HEADER*, const HEADER*);
int mutt_cmp_addr (const address_t * a, const address_t * b);
int mutt_cmp_list (const string_list_t * a, const string_list_t * b);
time_t mutt_decrease_mtime (const char *, struct stat *);
void mutt_set_mtime (const char*, const char*);
-time_t mutt_parse_date (const char *, HEADER *);
int is_from (const char *, char *, ssize_t, time_t *);
const char *mutt_charset_hook (const char *);
void mutt_adv_mktemp (const char*, char*, ssize_t);
int mutt_bounce_message (FILE * fp, HEADER *, address_t *);
void mutt_check_rescore (CONTEXT *);
-void mutt_clear_error (void);
void mutt_default_save (char *, ssize_t, HEADER *);
void mutt_display_address (ENVELOPE *);
void mutt_edit_content_type (HEADER *, BODY *, FILE *);
-void mutt_edit_file (const char *, const char *);
void mutt_edit_headers (const char *, const char *, HEADER *, char *, ssize_t);
-void mutt_curses_error (const char *, ...);
-void mutt_curses_message (const char *, ...);
void mutt_enter_command (void);
void mutt_expand_file_fmt (char *, ssize_t, const char *, const char *);
void mutt_expand_fmt (char *, ssize_t, const char *, const char *);
void mutt_expand_link (char *, const char *, const char *);
void mutt_fix_reply_recipients (ENVELOPE * env);
void mutt_folder_hook (char *);
-void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
- ssize_t, int);
-void mutt_format_s (char *, ssize_t, const char *, const char *);
-void mutt_format_s_tree (char *, ssize_t, const char *, const char *);
void mutt_forward_intro (FILE * fp, HEADER * cur);
void mutt_forward_trailer (FILE * fp);
-void mutt_free_color (int fg, int bg);
-void mutt_generate_header (char *, ssize_t, HEADER *, int);
void mutt_help (int);
void mutt_draw_tree (CONTEXT *);
void mutt_make_attribution (CONTEXT * ctx, HEADER * cur, FILE * out);
#define mutt_mktemp(a) _mutt_mktemp (a, __FILE__, __LINE__)
void _mutt_mktemp (char *, const char *, int);
-void mutt_paddstr (int, const char *);
-void mutt_parse_mime_message (CONTEXT * ctx, HEADER *);
-#define mutt_perror(a) _mutt_perror (a, __FILE__, __LINE__)
-void _mutt_perror (const char*, const char*,int);
void mutt_prepare_envelope (ENVELOPE *, int);
void mutt_unprepare_envelope (ENVELOPE *);
void mutt_pretty_mailbox (char *);
void mutt_pretty_size (char *, ssize_t, long);
void mutt_pipe_message (HEADER *);
void mutt_print_message (HEADER *);
-void mutt_query_exit (void);
-void mutt_query_menu (char *, ssize_t);
void mutt_safe_path (char *s, ssize_t l, address_t * a);
void mutt_save_path (char *s, ssize_t l, address_t * a);
void mutt_score_message (CONTEXT *, HEADER *, int);
#define mutt_set_flag(a,b,c,d) _mutt_set_flag(a,b,c,d,1)
void mutt_set_followup_to (ENVELOPE *);
void mutt_shell_escape (void);
-void mutt_show_error (void);
void mutt_stamp_attachment (BODY * a);
-void mutt_tabs_to_spaces (char *);
void mutt_tag_set_flag (int, int);
void mutt_update_encoding (BODY * a);
void mutt_version (void);
void mutt_write_address_list (address_t * adr, FILE * fp, int linelen,
int display);
-int mutt_addwch (wchar_t);
-int mutt_alloc_color (int fg, int bg);
-int mutt_any_key_to_continue (const char *);
int mutt_can_decode (BODY *);
int mutt_change_flag (HEADER *, int);
-int mutt_check_key (const char *);
int mutt_check_menu (const char *);
int mutt_check_month (const char *);
int mutt_check_overwrite (const char *, const char *, char *, ssize_t, int *,
int mutt_check_traditional_pgp (HEADER *, int *);
int mutt_command_complete (char *, ssize_t, int, int);
int mutt_var_value_complete (char *, ssize_t, int);
-int mutt_complete (char *, ssize_t);
int mutt_copy_body (FILE *, BODY **, BODY *);
int mutt_display_message (HEADER * h);
int mutt_prepare_template (FILE *, CONTEXT *, HEADER *, HEADER *, short);
int mutt_resend_message (FILE *, CONTEXT *, HEADER *);
-#define mutt_enter_fname(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL)
-int _mutt_enter_fname (const char *, char *, ssize_t, int *, int, int,
- char ***, int *);
-#define mutt_get_field(A,B,C,D) _mutt_get_field(A,B,C,D,0,NULL,NULL)
-int _mutt_get_field (const char *, char *, ssize_t, int, int, char ***, int *);
-int mutt_get_field_unbuffered (char *, char *, ssize_t, int);
int mutt_get_hook_type (const char *);
int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, ssize_t);
-int mutt_index_menu (void);
int mutt_invoke_mta (address_t *, address_t *, address_t *, address_t *, const char *,
int);
-int mutt_is_mail_list (address_t *);
int mutt_is_list_cc (int, address_t *, address_t *);
int mutt_is_list_recipient (int, address_t *, address_t *);
-int mutt_is_subscribed_list (address_t *);
-int mutt_is_valid_mailbox (const char *);
int mutt_lookup_mime_type (BODY *, const char *);
int mutt_match_spam_list (const char *, SPAM_LIST *, char *, int);
-int mutt_multi_choice (char *prompt, char *letters);
int mutt_num_postponed (int);
int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_exec (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_color (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_uncolor (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_hook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_macro (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_mono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_unmono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_push (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_rc_line ( /* const */ char *, BUFFER *, BUFFER *);
int mutt_parse_score (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_unscore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_unhook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_pattern_func (int, char *);
-int mutt_query_complete (char *, ssize_t);
int mutt_query_variables (string_list_t * queries);
int _mutt_save_message (HEADER *, CONTEXT *, int, int, int);
int mutt_save_message (HEADER *, int, int, int, int *);
int mutt_search_command (int, int);
-int mutt_strwidth (const char *);
int mutt_compose_menu (HEADER *, char *, ssize_t, HEADER *);
int mutt_thread_set_flag (HEADER *, int, int, int);
-int mutt_user_is_recipient (HEADER *);
void mutt_update_num_postponed (void);
int mutt_which_case (const char *);
int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, int,
int mutt_write_mime_body (BODY *, FILE *);
int mutt_write_mime_header (BODY *, FILE *);
int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int);
-int mutt_yesorno (const char *, int);
-void mutt_set_header_color (CONTEXT *, HEADER *);
void mutt_sleep (short);
int mutt_save_confirm (const char *, struct stat *);
-int mh_valid_message (const char *);
-
/* base64.c */
void mutt_to_base64 (unsigned char *, const unsigned char *, ssize_t, ssize_t);
int mutt_from_base64 (char *, const char *);
-#define IsPrint(c) (isprint((unsigned char)(c)) || \
- (option (OPTLOCALES) ? 0 : \
- ((unsigned char)(c) >= 0xa0)))
-#define IsWPrint(wc) (iswprint(wc) || \
- (option (OPTLOCALES) ? 0 : (wc >= 0xa0)))
-
#define new_pattern() p_new(pattern_t, 1)
+#define mutt_new_enter_state() p_new(ENTER_STATE, 1)
int mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
CONTEXT * ctx, HEADER * h);
void mutt_check_simple (char *s, ssize_t len, const char *simple);
void mutt_pattern_free (pattern_t ** pat);
-/* unsorted */
void ci_bounce_message (HEADER *, int *);
int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *);
+
+/* flags for mutt_extract_token() */
+#define M_TOKEN_EQUAL 1 /* treat '=' as a special */
+#define M_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */
+#define M_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */
+#define M_TOKEN_QUOTE (1<<3) /* don't interpret quotes */
+#define M_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */
+#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
+#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
+
+int mutt_extract_token(BUFFER *, BUFFER *, int);
+
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <sys/file.h>
#include <fcntl.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "sort.h"
#include <sys/types.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
return 0;
}
-string_list_t *mutt_make_references (ENVELOPE * e)
-{
- string_list_t *t = NULL, *l = NULL;
-
- if (e->references)
- l = string_list_dup(e->references);
- else
- l = string_list_dup(e->in_reply_to);
-
- if (e->message_id) {
- t = string_item_new();
- t->data = m_strdup(e->message_id);
- t->next = l;
- l = t;
- }
-
- return l;
-}
-
void mutt_fix_reply_recipients (ENVELOPE * env)
{
mutt_expand_aliases_env (env);
}
/* the CC field can get cluttered, especially with lists */
- env->to = mutt_remove_duplicates (env->to);
- env->cc = mutt_remove_duplicates (env->cc);
+ address_list_uniq(&env->to);
+ address_list_uniq(&env->cc);
env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to) {
#endif
}
+static string_list_t *mutt_make_references (ENVELOPE * e)
+{
+ string_list_t *t = NULL, *l = NULL;
+
+ if (e->references)
+ l = string_list_dup(e->references);
+ else
+ l = string_list_dup(e->in_reply_to);
+
+ if (e->message_id) {
+ t = string_item_new();
+ t->data = m_strdup(e->message_id);
+ t->next = l;
+ l = t;
+ }
+
+ return l;
+}
+
void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
string_list_t *** pp, string_list_t *** qq)
{
}
}
- e->mail_followup_to = mutt_remove_duplicates(e->mail_followup_to);
+ address_list_uniq(&e->mail_followup_to);
}
}
#include <fcntl.h>
#include <sys/utsname.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
return ret;
}
-
-/* given a list of addresses, return a list of unique addresses */
-address_t *mutt_remove_duplicates (address_t * addr)
-{
- address_t *top = addr;
- address_t **last = ⊤
- address_t *tmp;
- int dodup = 0;
-
- while (addr) {
- for (tmp = top; tmp && tmp != addr; tmp = tmp->next) {
- if (tmp->mailbox && addr->mailbox &&
- !ascii_strcasecmp (addr->mailbox, tmp->mailbox)) {
- dodup = 1;
- break;
- }
- }
-
- if (dodup) {
- *last = addr->next;
-
- addr->next = NULL;
- address_list_wipe(&addr);
-
- addr = *last;
- }
- else {
- last = &addr->next;
- addr = addr->next;
- }
- }
-
- return (top);
-}
-
static void set_noconv_flags (BODY * b, short flag)
{
for (; b; b = b->next) {
#include <ctype.h>
#include <unistd.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "alias.h"
/* FIXME: This one does not belong to here */
WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);
-#include <lib-lib/mapping.h>
extern const struct mapping_t SortMethods[];
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "sort.h"
#ifndef MUTT_XTERM_H
#define MUTT_XTERM_H
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include <stdio.h>
/* sets the current xterm's title */