X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbspcasecmp.c;h=7df9904c6720b974f703155e4be9b44191d1cab3;hb=e0bf16819c83c3ef1d11bf373f5f90a1f09c534c;hp=1e452e8fdb5f25f6c4a9e49444d995bb0b3dae4c;hpb=58d5932625bc1e3b8f4438fa6c69a33c3b5f2ebb;p=gnulib.git

diff --git a/lib/mbspcasecmp.c b/lib/mbspcasecmp.c
index 1e452e8fd..7df9904c6 100644
--- a/lib/mbspcasecmp.c
+++ b/lib/mbspcasecmp.c
@@ -1,11 +1,11 @@
 /* Case-insensitive string comparison function.
-   Copyright (C) 1998-1999, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
-   This program is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 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
@@ -13,8 +13,7 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -23,9 +22,7 @@
 
 #include <ctype.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
 
@@ -48,7 +45,6 @@ mbspcasecmp (const char *string, const char *prefix)
   /* Be careful not to look at the entire extent of STRING or PREFIX until
      needed.  This is useful because when two strings differ, the difference is
      most often already in the very few first characters.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter1;
@@ -58,43 +54,42 @@ mbspcasecmp (const char *string, const char *prefix)
       mbui_init (iter2, prefix);
 
       while (mbui_avail (iter1) && mbui_avail (iter2))
-	{
-	  int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
+        {
+          int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
 
-	  if (cmp != 0)
-	    return NULL;
+          if (cmp != 0)
+            return NULL;
 
-	  mbui_advance (iter1);
-	  mbui_advance (iter2);
-	}
+          mbui_advance (iter1);
+          mbui_advance (iter2);
+        }
       if (!mbui_avail (iter2))
-	/* PREFIX equals STRING or is terminated before STRING.  */
-	return (char *) mbui_cur_ptr (iter1);
+        /* PREFIX equals STRING or is terminated before STRING.  */
+        return (char *) mbui_cur_ptr (iter1);
       else
-	/* STRING terminated before PREFIX.  */
-	return NULL;
+        /* STRING terminated before PREFIX.  */
+        return NULL;
     }
   else
-#endif
     {
       const unsigned char *p1 = (const unsigned char *) string;
       const unsigned char *p2 = (const unsigned char *) prefix;
       unsigned char c1, c2;
 
       for (; ; p1++, p2++)
-	{
-	  c1 = TOLOWER (*p1);
-	  c2 = TOLOWER (*p2);
+        {
+          c1 = TOLOWER (*p1);
+          c2 = TOLOWER (*p2);
 
-	  if (c2 == '\0' || c1 != c2)
-	    break;
-	}
+          if (c2 == '\0' || c1 != c2)
+            break;
+        }
 
       if (c2 == '\0')
-	/* PREFIX equals STRING or is terminated before STRING.  */
-	return (char *) p1;
+        /* PREFIX equals STRING or is terminated before STRING.  */
+        return (char *) p1;
       else
-	/* STRING terminated before PREFIX.  */
-	return NULL;
+        /* STRING terminated before PREFIX.  */
+        return NULL;
     }
 }