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

diff --git a/lib/unistr/u8-check.c b/lib/unistr/u8-check.c
index 53897fc5a..29dc46311 100644
--- a/lib/unistr/u8-check.c
+++ b/lib/unistr/u8-check.c
@@ -1,5 +1,5 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006-2007 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
@@ -27,77 +27,77 @@ u8_check (const uint8_t *s, size_t n)
 
   while (s < s_end)
     {
-      /* 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)
-	{
-	  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;
     }