From 59f6876dedd0cdb77e22aad3fa85f87aa153845d Mon Sep 17 00:00:00 2001 From: Phil Schwan Date: Thu, 5 Nov 1998 01:36:36 +0000 Subject: [PATCH] Added 'strncasecmp' to the list of functions to be searched for. Added a 1998-11-04 Phil Schwan * configure.in: Added 'strncasecmp' to the list of functions to be searched for. * glib.h: Added a prototype for 'g_strncasecmp' * strfuncs.c: (g_strncasecmp) new function modeled closely after 'g_strcasecmp' --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ configure.in | 2 +- glib.h | 3 +++ glib/glib.h | 3 +++ glib/gstrfuncs.c | 32 ++++++++++++++++++++++++++++++++ gstrfuncs.c | 32 ++++++++++++++++++++++++++++++++ 13 files changed, 135 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 261fbb21d..f89a5735d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 261fbb21d..f89a5735d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1998-11-04 Phil Schwan + + * configure.in: Added 'strncasecmp' to the list of functions to be + searched for. + * glib.h: Added a prototype for 'g_strncasecmp' + * gstrfuncs.c: (g_strncasecmp) new function modeled closely after + 'g_strcasecmp' + Wed Nov 4 15:06:44 PST 1998 Manish Singh * config.h.win32 (new file) diff --git a/configure.in b/configure.in index 709d54836..40eb7e558 100644 --- a/configure.in +++ b/configure.in @@ -233,7 +233,7 @@ AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H)) # Check for some functions -AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp) +AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp) # Check for sys_errlist AC_MSG_CHECKING(for sys_errlist) diff --git a/glib.h b/glib.h index 72941f7a9..9e9383683 100644 --- a/glib.h +++ b/glib.h @@ -1402,6 +1402,9 @@ gchar* g_strerror (gint errnum); gchar* g_strsignal (gint signum); gint g_strcasecmp (const gchar *s1, const gchar *s2); +gint g_strncasecmp (const gchar *s1, + const gchar *s2, + guint n); void g_strdown (gchar *string); void g_strup (gchar *string); void g_strreverse (gchar *string); diff --git a/glib/glib.h b/glib/glib.h index 72941f7a9..9e9383683 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -1402,6 +1402,9 @@ gchar* g_strerror (gint errnum); gchar* g_strsignal (gint signum); gint g_strcasecmp (const gchar *s1, const gchar *s2); +gint g_strncasecmp (const gchar *s1, + const gchar *s2, + guint n); void g_strdown (gchar *string); void g_strup (gchar *string); void g_strreverse (gchar *string); diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index c01877bd7..ad28978ee 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -975,6 +975,38 @@ g_strcasecmp (const gchar *s1, #endif } +gint +g_strncasecmp (const gchar *s1, + const gchar *s2, + guint n) +{ +#ifdef HAVE_STRNCASECMP + return strncasecmp (s1, s2, n); +#else + gint c1, c2; + + g_return_val_if_fail (s1 != NULL, 0); + g_return_val_if_fail (s2 != NULL, 0); + + while (n-- && *s1 && *s2) + { + /* According to A. Cox, some platforms have islower's that + * don't work right on non-uppercase + */ + c1 = isupper ((guchar)*s1) ? tolower ((guchar)*s1) : *s1; + c2 = isupper ((guchar)*s2) ? tolower ((guchar)*s2) : *s2; + if (c1 != c2) + return (c1 - c2); + s1++; s2++; + } + + if (n) + return (((gint)(guchar) *s1) - ((gint)(guchar) *s2)); + else + return 0; +#endif +} + gchar* g_strdelimit (gchar *string, const gchar *delimiters, diff --git a/gstrfuncs.c b/gstrfuncs.c index c01877bd7..ad28978ee 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -975,6 +975,38 @@ g_strcasecmp (const gchar *s1, #endif } +gint +g_strncasecmp (const gchar *s1, + const gchar *s2, + guint n) +{ +#ifdef HAVE_STRNCASECMP + return strncasecmp (s1, s2, n); +#else + gint c1, c2; + + g_return_val_if_fail (s1 != NULL, 0); + g_return_val_if_fail (s2 != NULL, 0); + + while (n-- && *s1 && *s2) + { + /* According to A. Cox, some platforms have islower's that + * don't work right on non-uppercase + */ + c1 = isupper ((guchar)*s1) ? tolower ((guchar)*s1) : *s1; + c2 = isupper ((guchar)*s2) ? tolower ((guchar)*s2) : *s2; + if (c1 != c2) + return (c1 - c2); + s1++; s2++; + } + + if (n) + return (((gint)(guchar) *s1) - ((gint)(guchar) *s2)); + else + return 0; +#endif +} + gchar* g_strdelimit (gchar *string, const gchar *delimiters,