move ascii.* into the lib-lib.

inline some functions.

diff --git a/Makefile.am b/Makefile.am
index b201ba8..6823557 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ BUILT_SOURCES = keymap_defs.h version.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
 
 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 \
        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 \


@@ -108,7 +108,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        _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\
        _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
 
        mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
        regex.c mutt_libesmtp.h crypt-gpgme.h
 


@@ -116,7 +116,7 @@ muttng_dotlock_SOURCES = dotlock.c
 muttng_dotlock_LDADD = @LIBOBJS@
 muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
 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)
 
 pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib -lsane
 pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 

diff --git a/account.c b/account.c
index c22b57d..5270c2e 100644 (file)
--- a/account.c
+++ b/account.c
@@ -15,11 +15,11 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"

-#include "ascii.h"

 #include "account.h"
 #include "url.h"
 
 #include "account.h"
 #include "url.h"
 

diff --git a/alias.c b/alias.c
index a4e984f..1ef818e 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -15,6 +15,7 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.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/str.h>
 #include <lib-lib/macros.h>
 


@@ -23,7 +24,6 @@
 
 #include "mutt.h"
 #include "enter.h"
 
 #include "mutt.h"
 #include "enter.h"

-#include "ascii.h"

 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"

diff --git a/ascii.c b/ascii.c
deleted file mode 100644 (file)
index c0599c1..0000000
--- a/ascii.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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;
-}

diff --git a/ascii.h b/ascii.h
deleted file mode 100644 (file)
index 2c0a42b..0000000
--- a/ascii.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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

diff --git a/attach.c b/attach.c
index 6cbaa6b..0daba27 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -13,11 +13,11 @@
 #endif
 
 #include <lib-lib/mem.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 <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 "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"

diff --git a/charset.c b/charset.c
index dcbe1ee..5d7e0cc 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -23,12 +23,12 @@
 #include <errno.h>
 
 #include <lib-lib/mem.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 <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "charset.h"

-#include "ascii.h"

 
 
 #ifndef EILSEQ
 
 
 #ifndef EILSEQ

diff --git a/color.c b/color.c
index 81adfbb..ab2a500 100644 (file)
--- a/color.c
+++ b/color.c
@@ -12,12 +12,12 @@
 #endif
 
 #include <lib-lib/mem.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 <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 "mutt_curses.h"
 #include "mapping.h"
 

diff --git a/commands.c b/commands.c
index 52fe118..0cfc226 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -15,11 +15,11 @@
 #include <lib-lib/mem.h>
 
 #include <lib-lib/macros.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 "mutt.h"
 #include "enter.h"
 #include "recvattach.h"

-#include "ascii.h"

 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mime.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mime.h"

diff --git a/copy.c b/copy.c
index 2d205de..bb429f4 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -13,9 +13,9 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index af921cd..ea750ec 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -20,13 +20,13 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <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"
 #include "handler.h"
 #include "enter.h"
 #include "mime.h"

diff --git a/crypt.c b/crypt.c
index 56b1571..83ab1ad 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -17,11 +17,11 @@
 #endif
 
 #include <lib-lib/str.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 <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"
 #include "handler.h"
 #include "mutt_curses.h"
 #include "mime.h"

diff --git a/edit.c b/edit.c
index e1bc6df..47f4480 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -14,11 +14,11 @@
 #endif
 
 #include <lib-lib/mem.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 <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 "enter.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"

diff --git a/handler.c b/handler.c
index 61efc4b..137cc7d 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -19,11 +19,11 @@
 #include <sys/stat.h>
 
 #include <lib-lib/mem.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 <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"
 #include "recvattach.h"
 #include "handler.h"
 #include "mutt_curses.h"

diff --git a/headers.c b/headers.c
index 031e2a9..1c928fa 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -12,9 +12,9 @@
 #endif
 
 #include <lib-lib/macros.h>
 #endif
 
 #include <lib-lib/macros.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 

diff --git a/imap/auth.c b/imap/auth.c
index 47f305f..04fe671 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -18,10 +18,10 @@
 #include <lib-lib/mem.h>
 
 #include <lib-lib/macros.h>
 #include <lib-lib/mem.h>
 
 #include <lib-lib/macros.h>

+#include <lib-lib/ascii.h>

 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "lib/debug.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "imap_private.h"
 #include "auth.h"
 
 #include "imap_private.h"
 #include "auth.h"
 

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 75ec4d4..4d5495f 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -14,9 +14,9 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"

diff --git a/imap/browse.c b/imap/browse.c
index 2ee4bff..68974a2 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -19,12 +19,12 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "lib/debug.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "enter.h"
 #include "imap_private.h"
 
 #include "enter.h"
 #include "imap_private.h"
 

diff --git a/imap/command.c b/imap/command.c
index 36762a1..b4b3fc9 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -17,6 +17,7 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 #include <lib-lib/macros.h>
 
 #include "lib/debug.h"
 #include <lib-lib/macros.h>
 
 #include "lib/debug.h"


@@ -24,7 +25,6 @@
 #include "mutt.h"
 #include "message.h"
 #include "mx.h"
 #include "mutt.h"
 #include "message.h"
 #include "mx.h"

-#include "ascii.h"

 #include "imap_private.h"
 
 #include <ctype.h>
 #include "imap_private.h"
 
 #include <ctype.h>

diff --git a/imap/imap.c b/imap/imap.c
index 03ef513..e7fcb77 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -16,10 +16,10 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 #include <lib-lib/str.h>
 
 #include "mutt.h"
 #include <lib-lib/str.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "buffer.h"
 #include "mx.h"
 #include "globals.h"
 #include "buffer.h"
 #include "mx.h"
 #include "globals.h"

diff --git a/imap/message.c b/imap/message.c
index 2e5b614..1e77cb6 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -18,10 +18,10 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
 #include <ctype.h>
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 #include <lib-lib/str.h>
 
 #include "mutt.h"
 #include <lib-lib/str.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "buffer.h"
 #include "mutt_curses.h"
 #include "imap_private.h"
 #include "buffer.h"
 #include "mutt_curses.h"
 #include "imap_private.h"

diff --git a/imap/util.c b/imap/util.c
index 992423e..63dd769 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -14,10 +14,10 @@
 #include "config.h"
 
 #include <lib-lib/mem.h>
 #include "config.h"
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */

-#include "ascii.h"

 #include "url.h"
 #include "imap_private.h"
 #include "mutt_ssl.h"
 #include "url.h"
 #include "imap_private.h"
 #include "mutt_ssl.h"

diff --git a/init.c b/init.c
index f00ec21..f01fb9d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -16,11 +16,11 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"

-#include "ascii.h"

 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"
 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"

diff --git a/keymap.c b/keymap.c
index 586d4fa..641f232 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -12,12 +12,12 @@
 #endif
 
 #include <lib-lib/mem.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 <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"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"

diff --git a/lib-lib/Makefile.am b/lib-lib/Makefile.am
index 3233c27..2251d47 100644 (file)
--- a/lib-lib/Makefile.am
+++ b/lib-lib/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = liblib.a
 
 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

 
 

diff --git a/lib-lib/ascii.c b/lib-lib/ascii.c
new file mode 100644 (file)
index 0000000..697e1d7
--- /dev/null
+++ b/lib-lib/ascii.c
@@ -0,0 +1,55 @@
+/*
+ * 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;
+}

diff --git a/lib-lib/ascii.h b/lib-lib/ascii.h
new file mode 100644 (file)
index 0000000..ee8b205
--- /dev/null
+++ b/lib-lib/ascii.h
@@ -0,0 +1,46 @@
+/*
+ * 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 */

diff --git a/lib-lib/str.c b/lib-lib/str.c
new file mode 100644 (file)
index 0000000..55ac5ab
--- /dev/null
+++ b/lib-lib/str.c
@@ -0,0 +1,19 @@
+/*
+ *  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
+ */
+
+

diff --git a/lib-lib/str.h b/lib-lib/str.h
new file mode 100644 (file)
index 0000000..d9b1f9e
--- /dev/null
+++ b/lib-lib/str.h
@@ -0,0 +1,35 @@
+/*
+ *  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 */

diff --git a/mutt_idna.c b/mutt_idna.c
index 4b160f2..91a3349 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -12,11 +12,11 @@
 #endif
 
 #include <lib-lib/mem.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 <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "charset.h"
 #include "mutt_idna.h"
 
 #include "charset.h"
 #include "mutt_idna.h"
 

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index ab858f1..ceab41b 100644 (file)
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -16,10 +16,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "enter.h"
 
 
 #include "enter.h"
 
 

diff --git a/muttlib.c b/muttlib.c
index 857305a..9be7e75 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -13,11 +13,11 @@
 #endif
 
 #include <lib-lib/mem.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 <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"
 #include "buffer.h"
 #include "enter.h"
 #include "mutt_curses.h"

diff --git a/mx.c b/mx.c
index 4160eeb..5a815fe 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -13,12 +13,12 @@
 #endif
 
 #include <lib-lib/mem.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 <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 "mx.h"
 #include "mbox.h"
 #include "mh.h"

diff --git a/parse.c b/parse.c
index fe0a40d..1f7bac0 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -13,12 +13,12 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <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"
 #include "recvattach.h"
 #include "mx.h"
 #include "mime.h"

diff --git a/pattern.c b/pattern.c
index f4c0548..c40f9ca 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.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/str.h>
 #include <lib-lib/macros.h>
 


@@ -19,7 +20,6 @@
 #include "buffer.h"
 #include "handler.h"
 #include "enter.h"
 #include "buffer.h"
 #include "handler.h"
 #include "enter.h"

-#include "ascii.h"

 #include "mx.h"
 #include "mapping.h"
 #include "keymap.h"
 #include "mx.h"
 #include "mapping.h"
 #include "keymap.h"

diff --git a/pgp.c b/pgp.c
index a649499..18931a1 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -22,12 +22,12 @@
 #endif
 
 #include <lib-lib/mem.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 <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 "handler.h"
 #include "mutt_curses.h"
 #include "pgp.h"

diff --git a/pgpkey.c b/pgpkey.c
index eeb0048..a0aed72 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -14,11 +14,11 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"

-#include "ascii.h"

 #include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 09f0761..2e8bd21 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -12,10 +12,10 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mx.h"
 #include "md5.h"
 #include "pop.h"
 #include "mx.h"
 #include "md5.h"
 #include "pop.h"

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 805ee1e..318fbdf 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -13,10 +13,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mx.h"
 #include "url.h"
 #include "pop.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"

diff --git a/postpone.c b/postpone.c
index eb62d22..f73fa4e 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -14,10 +14,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "enter.h"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "enter.h"
 #include "handler.h"
 #include "mutt_menu.h"

diff --git a/recvattach.c b/recvattach.c
index dd7ef8e..76f5185 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -15,9 +15,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.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 "mutt.h"

-#include "ascii.h"

 #include "enter.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "enter.h"
 #include "handler.h"
 #include "recvattach.h"

diff --git a/rfc1524.c b/rfc1524.c
index 5764beb..ceca551 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -23,10 +23,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "rfc1524.h"
 #include "attach.h"
 
 #include "rfc1524.h"
 #include "attach.h"
 

diff --git a/rfc2047.c b/rfc2047.c
index 84028ab..3769fef 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -14,9 +14,9 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mime.h"
 #include "charset.h"
 #include "rfc2047.h"
 #include "mime.h"
 #include "charset.h"
 #include "rfc2047.h"

diff --git a/rfc2231.c b/rfc2231.c
index 87856ac..aa6b071 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -23,9 +23,9 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mime.h"
 #include "charset.h"
 #include "rfc2047.h"
 #include "mime.h"
 #include "charset.h"
 #include "rfc2047.h"

diff --git a/rfc3676.c b/rfc3676.c
index 5304d59..a7144c2 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -22,11 +22,11 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"

-#include "ascii.h"

 #include "handler.h"
 #include "state.h"
 #include "lib.h"
 #include "handler.h"
 #include "state.h"
 #include "lib.h"

diff --git a/rfc822.c b/rfc822.c
index 25aa1c4..f0d9b00 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -17,10 +17,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mutt_idna.h"
 
 
 #include "mutt_idna.h"
 
 

diff --git a/send.c b/send.c
index d39deae..aa4e4e3 100644 (file)
--- a/send.c
+++ b/send.c
@@ -13,11 +13,11 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.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 <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"

-#include "ascii.h"

 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "rfc3676.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "rfc3676.h"

diff --git a/sendlib.c b/sendlib.c
index 60673be..5aa7974 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -14,11 +14,11 @@
 #endif
 
 #include <lib-lib/mem.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 <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"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_curses.h"

diff --git a/url.c b/url.c
index 5fb6d46..8c49fd0 100644 (file)
--- a/url.c
+++ b/url.c
@@ -16,9 +16,9 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/ascii.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "ascii.h"

 #include "mapping.h"
 #include "url.h"
 
 #include "mapping.h"
 #include "url.h"