New module 'posix_spawnattr_destroy'.

[gnulib.git] / lib / unistr / u8-mbtouc.c

diff --git a/lib/unistr/u8-mbtouc.c b/lib/unistr/u8-mbtouc.c
index 7f61b67..6259443 100644 (file)
--- a/lib/unistr/u8-mbtouc.c
+++ b/lib/unistr/u8-mbtouc.c
@@ -2,20 +2,18 @@
    Copyright (C) 1999-2002, 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
-   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>
 
@@ -40,9 +38,7 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 2)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40)
-#endif
                {
                  *puc = ((unsigned int) (c & 0x1f) << 6)
                         | (unsigned int) (s[1] ^ 0x80);
@@ -61,11 +57,9 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 3)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                  && (c >= 0xe1 || s[1] >= 0xa0)
                  && (c != 0xed || s[1] < 0xa0))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x0f) << 12)
                         | ((unsigned int) (s[1] ^ 0x80) << 6)
@@ -85,7 +79,6 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 4)
            {
-#if CONFIG_UNICODE_SAFETY
              if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                  && (s[3] ^ 0x80) < 0x40
                  && (c >= 0xf1 || s[1] >= 0x90)
@@ -93,7 +86,6 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
 #endif
                 )
-#endif
                {
                  *puc = ((unsigned int) (c & 0x07) << 18)
                         | ((unsigned int) (s[1] ^ 0x80) << 12)
@@ -115,11 +107,9 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 5)
            {
-#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))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x03) << 24)
                         | ((unsigned int) (s[1] ^ 0x80) << 18)
@@ -141,12 +131,10 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
        {
          if (n >= 6)
            {
-#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))
-#endif
                {
                  *puc = ((unsigned int) (c & 0x01) << 30)
                         | ((unsigned int) (s[1] ^ 0x80) << 24)