inline some functions.
bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
muttng_SOURCES = $(BUILT_SOURCES) \
- alias.c ascii.c attach.c \
+ alias.c attach.c \
base64.c buffer.c browser.c buffy.c \
charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
makedoc.c stamp-doc-rc README.SSL smime.h\
- muttngbug pgppacket.h depcomp ascii.h BEWARE \
+ muttngbug pgppacket.h depcomp BEWARE \
mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
regex.c mutt_libesmtp.h crypt-gpgme.h
muttng_dotlock_LDADD = @LIBOBJS@
muttng_dotlock_DEPENDENCIES = @LIBOBJS@
-pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
+pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c
pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib -lsane
pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "account.h"
#include "url.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 "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_menu.h"
+++ /dev/null
-/*
- * Copyright notice from original mutt:
- * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-
-/*
- * Versions of the string comparison functions which are
- * locale-insensitive.
- */
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "ascii.h"
-
-int ascii_isupper (int c)
-{
- return (c >= 'A') && (c <= 'Z');
-}
-
-int ascii_islower (int c)
-{
- return (c >= 'a') && (c <= 'z');
-}
-
-int ascii_toupper (int c)
-{
- if (ascii_islower (c))
- return c & ~32;
-
- return c;
-}
-
-int ascii_tolower (int c)
-{
- if (ascii_isupper (c))
- return c | 32;
-
- return c;
-}
-
-int ascii_strcasecmp (const char *a, const char *b)
-{
- int i;
-
- if (a == b)
- return 0;
- if (a == NULL && b)
- return -1;
- if (b == NULL && a)
- return 1;
-
- for (; *a || *b; a++, b++) {
- if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
- return i;
- }
-
- return 0;
-}
-
-int ascii_strncasecmp (const char *a, const char *b, int n)
-{
- int i, j;
-
- if (a == b)
- return 0;
- if (a == NULL && b)
- return -1;
- if (b == NULL && a)
- return 1;
-
- for (j = 0; (*a || *b) && j < n; a++, b++, j++) {
- if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
- return i;
- }
-
- return 0;
-}
+++ /dev/null
-/*
- * Copyright notice from original mutt:
- * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-
-/*
- * Versions of the string comparison functions which are
- * locale-insensitive.
- */
-
-#ifndef _ASCII_H
-# define _ASCII_H
-
-int ascii_isupper (int c);
-int ascii_islower (int c);
-int ascii_toupper (int c);
-int ascii_tolower (int c);
-int ascii_strcasecmp (const char *a, const char *b);
-int ascii_strncasecmp (const char *a, const char *b, int n);
-
-#define ascii_strcmp(a,b) str_cmp(a,b)
-#define ascii_strncmp(a,b,c) str_ncmp(a,b,c)
-
-#endif
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_menu.h"
#include <errno.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "charset.h"
-#include "ascii.h"
#ifndef EILSEQ
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mapping.h"
#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_crypt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "enter.h"
#include "mime.h"
#endif
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mutt_curses.h"
#include "mime.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.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 "mutt.h"
-#include "ascii.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt_curses.h"
#endif
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
#include "lib/debug.h"
#include "mutt.h"
-#include "ascii.h"
#include "imap_private.h"
#include "auth.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "lib/debug.h"
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "imap_private.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "lib/debug.h"
#include "mutt.h"
#include "message.h"
#include "mx.h"
-#include "ascii.h"
#include "imap_private.h"
#include <ctype.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include "mutt.h"
-#include "ascii.h"
#include "buffer.h"
#include "mx.h"
#include "globals.h"
#include <ctype.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include "mutt.h"
-#include "ascii.h"
#include "buffer.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "config.h"
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
#include "mx.h" /* for M_IMAP */
-#include "ascii.h"
#include "url.h"
#include "imap_private.h"
#include "mutt_ssl.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
-#include "ascii.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "history.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
-#include "ascii.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES = mem.h str.h \
- str.c
+liblib_a_SOURCES = mem.h str.h ascii.h \
+ str.c ascii.c
-noinst_HEADERS = mem.h str.h
+noinst_HEADERS = mem.h str.h ascii.h
--- /dev/null
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
+/*
+ * Versions of the string comparison functions which are
+ * locale-insensitive.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "ascii.h"
+
+int ascii_strcasecmp(const char *a, const char *b)
+{
+ int i;
+
+ if (a == b)
+ return 0;
+ if (a == NULL && b)
+ return -1;
+ if (b == NULL && a)
+ return 1;
+
+ for (; *a || *b; a++, b++) {
+ if ((i = ascii_tolower(*a) - ascii_tolower(*b)))
+ return i;
+ }
+
+ return 0;
+}
+
+int ascii_strncasecmp (const char *a, const char *b, int n)
+{
+ int i, j;
+
+ if (a == b)
+ return 0;
+ if (a == NULL && b)
+ return -1;
+ if (b == NULL && a)
+ return 1;
+
+ for (j = 0; (*a || *b) && j < n; a++, b++, j++) {
+ if ((i = ascii_tolower(*a) - ascii_tolower(*b)))
+ return i;
+ }
+
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
+/*
+ * Versions of the string comparison functions which are
+ * locale-insensitive.
+ */
+
+#ifndef MUTT_LIB_LIB_ASCII_H
+#define MUTT_LIB_LIB_ASCII_H
+
+static inline int ascii_isupper(int c) {
+ return c >= 'A' && c <= 'Z';
+}
+
+static inline int ascii_islower(int c) {
+ return c >= 'a' && c <= 'z';
+}
+
+static inline int ascii_toupper(int c) {
+ if (ascii_islower(c))
+ return c & ~32;
+
+ return c;
+}
+
+static inline int ascii_tolower(int c) {
+ if (ascii_isupper(c))
+ return c | 32;
+
+ return c;
+}
+
+int ascii_strcasecmp(const char *a, const char *b);
+int ascii_strncasecmp(const char *a, const char *b, int n);
+
+#define ascii_strcmp(a,b) str_cmp(a,b)
+#define ascii_strncmp(a,b,c) str_ncmp(a,b,c)
+
+#endif /* MUTT_LIB_LIB_ASCII_H */
--- /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
+ */
+
+
--- /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_STR_H
+#define MUTT_LIB_LIB_STR_H
+
+#include <string.h>
+#include "../lib/str.h"
+
+#include "mem.h"
+
+static inline ssize_t m_strlen(const char *s) {
+ return s ? strlen(s) : 0;
+}
+
+static inline char* m_strdup(const char *s) {
+ return p_dupstr(s, m_strlen(s));
+}
+
+#endif /* MUTT_LIB_LIB_STR_H */
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "charset.h"
#include "mutt_idna.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "buffer.h"
#include "enter.h"
#include "mutt_curses.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffy.h"
-#include "ascii.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "enter.h"
-#include "ascii.h"
#include "recvattach.h"
#include "mx.h"
#include "mime.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "buffer.h"
#include "handler.h"
#include "enter.h"
-#include "ascii.h"
#include "mx.h"
#include "mapping.h"
#include "keymap.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "mx.h"
#include "md5.h"
#include "pop.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "recvattach.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "rfc1524.h"
#include "attach.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mime.h"
#include "charset.h"
#include "rfc2047.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mime.h"
#include "charset.h"
#include "rfc2047.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "mutt_idna.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "rfc3676.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mapping.h"
#include "url.h"