X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu8-check.c;h=29dc463118f01ac365038d2c5cbd1c38203afe9e;hb=4fe68d4176b4f0da64660bb9ce0f5412a6bb24de;hp=c178c994bbca69c5677aaeafae49c6ab51220c00;hpb=56c57655bb4d848c2ae5c416373a132fc77f007d;p=gnulib.git

diff --git a/lib/unistr/u8-check.c b/lib/unistr/u8-check.c
index c178c994b..29dc46311 100644
--- a/lib/unistr/u8-check.c
+++ b/lib/unistr/u8-check.c
@@ -1,21 +1,19 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 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>
 
@@ -29,77 +27,77 @@ u8_check (const uint8_t *s, size_t n)
 
   while (s < s_end)
     {
-      /* Keep in sync with utf8-ucs4.h and utf8-ucs4.c.  */
+      /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
       uint8_t c = *s;
 
       if (c < 0x80)
-	{
-	  s++;
-	  continue;
-	}
+        {
+          s++;
+          continue;
+        }
       if (c >= 0xc2)
-	{
-	  if (c < 0xe0)
-	    {
-	      if (s + 2 <= s_end
-		  && (s[1] ^ 0x80) < 0x40)
-		{
-		  s += 2;
-		  continue;
-		}
-	    }
-	  else if (c < 0xf0)
-	    {
-	      if (s + 3 <= s_end
-		  && (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (c >= 0xe1 || s[1] >= 0xa0)
-		  && (c != 0xed || s[1] < 0xa0))
-		{
-		  s += 3;
-		  continue;
-		}
-	    }
-	  else if (c < 0xf8)
-	    {
-	      if (s + 4 <= s_end
-		  && (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (s[3] ^ 0x80) < 0x40
-		  && (c >= 0xf1 || s[1] >= 0x90)
+        {
+          if (c < 0xe0)
+            {
+              if (s + 2 <= s_end
+                  && (s[1] ^ 0x80) < 0x40)
+                {
+                  s += 2;
+                  continue;
+                }
+            }
+          else if (c < 0xf0)
+            {
+              if (s + 3 <= s_end
+                  && (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s[1] >= 0xa0)
+                  && (c != 0xed || s[1] < 0xa0))
+                {
+                  s += 3;
+                  continue;
+                }
+            }
+          else if (c < 0xf8)
+            {
+              if (s + 4 <= s_end
+                  && (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
-		 )
-		{
-		  s += 4;
-		  continue;
-		}
-	    }
+                 )
+                {
+                  s += 4;
+                  continue;
+                }
+            }
 #if 0
-	  else if (c < 0xfc)
-	    {
-	      if (s + 5 <= s_end
-		  && (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-		  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-		  && (c >= 0xf9 || s[1] >= 0x88))
-		{
-		  s += 5;
-		  continue;
-		}
-	    }
-	  else if (c < 0xfe)
-	    {
-	      if (s + 6 <= s_end
-		  && (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))
-		{
-		  s += 6;
-		  continue;
-		}
-	    }
+          else if (c < 0xfc)
+            {
+              if (s + 5 <= s_end
+                  && (s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+                  && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+                  && (c >= 0xf9 || s[1] >= 0x88))
+                {
+                  s += 5;
+                  continue;
+                }
+            }
+          else if (c < 0xfe)
+            {
+              if (s + 6 <= s_end
+                  && (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))
+                {
+                  s += 6;
+                  continue;
+                }
+            }
 #endif
-	}
+        }
       /* invalid or incomplete multibyte character */
       return s;
     }