Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 15 insertions, 46 deletions

diff --git a/lib/unistr/u8-strmblen.c b/lib/unistr/u8-strmblen.c
index 09b876b..7941232 100644
--- a/lib/unistr/u8-strmblen.c
+++ b/lib/unistr/u8-strmblen.c
@@ -1,13 +1,22 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 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 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * 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.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
@@ -33,64 +42,24 @@ u8_strmblen (const uint8_t *s)
     {
       if (c < 0xe0)
         {
-#if CONFIG_UNICODE_SAFETY
           if ((s[1] ^ 0x80) < 0x40)
-#else
-          if (s[1] != 0)
-#endif
             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))
-#else
-          if (s[1] != 0 && s[2] != 0)
-#endif
             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 1
-              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
-#endif
-             )
-#else
-          if (s[1] != 0 && s[2] != 0 && s[3] != 0)
-#endif
+              && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90)))
             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))
-#else
-          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
-#endif
-            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))
-#else
-          if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
-#endif
-            return 6;
-        }
-#endif
     }
   /* invalid or incomplete multibyte character */
   return -1;