X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu8-strmblen.c;h=ecf5d96d9bd09bd4b0fcb1d8b56b69fab563d07d;hb=4fe68d4176b4f0da64660bb9ce0f5412a6bb24de;hp=00fd66a476dd2f45490f13867f8bb14774f5f666;hpb=5973fdf3621d596452f3b9d8af3492ccc530600a;p=gnulib.git

diff --git a/lib/unistr/u8-strmblen.c b/lib/unistr/u8-strmblen.c
index 00fd66a47..ecf5d96d9 100644
--- a/lib/unistr/u8-strmblen.c
+++ b/lib/unistr/u8-strmblen.c
@@ -1,21 +1,20 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2011 Free Software
+   Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by 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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -25,7 +24,7 @@
 int
 u8_strmblen (const uint8_t *s)
 {
-  /* Keep in sync with unistr.h and utf8-ucs4.c.  */
+  /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
   uint8_t c = *s;
 
   if (c < 0x80)
@@ -33,64 +32,64 @@ u8_strmblen (const uint8_t *s)
   if (c >= 0xc2)
     {
       if (c < 0xe0)
-	{
+        {
 #if CONFIG_UNICODE_SAFETY
-	  if ((s[1] ^ 0x80) < 0x40)
+          if ((s[1] ^ 0x80) < 0x40)
 #else
-	  if (s[1] != 0)
+          if (s[1] != 0)
 #endif
-	    return 2;
-	}
+            return 2;
+        }
       else if (c < 0xf0)
-	{
+        {
 #if CONFIG_UNICODE_SAFETY
-	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-	      && (c >= 0xe1 || s[1] >= 0xa0)
-	      && (c != 0xed || s[1] < 0xa0))
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (c >= 0xe1 || s[1] >= 0xa0)
+              && (c != 0xed || s[1] < 0xa0))
 #else
-	  if (s[1] != 0 && s[2] != 0)
+          if (s[1] != 0 && s[2] != 0)
 #endif
-	    return 3;
-	}
+            return 3;
+        }
       else if (c < 0xf8)
-	{
+        {
 #if CONFIG_UNICODE_SAFETY
-	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-	      && (s[3] ^ 0x80) < 0x40
-	      && (c >= 0xf1 || s[1] >= 0x90)
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (s[3] ^ 0x80) < 0x40
+              && (c >= 0xf1 || s[1] >= 0x90)
 #if 1
-	      && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
-	     )
+             )
 #else
-	  if (s[1] != 0 && s[2] != 0 && s[3] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0)
 #endif
-	    return 4;
-	}
+            return 4;
+        }
 #if 0
       else if (c < 0xfc)
-	{
+        {
 #if CONFIG_UNICODE_SAFETY
-	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-	      && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-	      && (c >= 0xf9 || s[1] >= 0x88))
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+              && (c >= 0xf9 || s[1] >= 0x88))
 #else
-	  if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
 #endif
-	    return 5;
-	}
+            return 5;
+        }
       else if (c < 0xfe)
-	{
+        {
 #if CONFIG_UNICODE_SAFETY
-	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-	      && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-	      && (s[5] ^ 0x80) < 0x40
-	      && (c >= 0xfd || s[1] >= 0x84))
+          if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+              && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+              && (s[5] ^ 0x80) < 0x40
+              && (c >= 0xfd || s[1] >= 0x84))
 #else
-	  if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
+          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
 #endif
-	    return 6;
-	}
+            return 6;
+        }
 #endif
     }
   /* invalid or incomplete multibyte character */