diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-27 21:42:03 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-27 21:42:03 +0200 |
| commit | db6f1f397f45ccd3c11d16352ed46a9c1eae3442 (patch) | |
| tree | e0b9334e2637f17696c796ac13b2c39294bf9233 /lib/unistr/u8-prev.c | |
| parent | 0250cb64565a7d5238bbc751225d4b0236ef8316 (diff) | |
| parent | 6b73edd95d603e27d55d4905134ac1327d426534 (diff) | |
Merge tag 'upstream/0.9.7'
Upstream version 0.9.7
Diffstat (limited to 'lib/unistr/u8-prev.c')
| -rw-r--r-- | lib/unistr/u8-prev.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/lib/unistr/u8-prev.c b/lib/unistr/u8-prev.c index e01551e..bdd7fb9 100644 --- a/lib/unistr/u8-prev.c +++ b/lib/unistr/u8-prev.c @@ -1,12 +1,21 @@ /* Iterate over previous character in UTF-8 string. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 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,9 +42,7 @@ u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start) *puc = c_1; return s - 1; } -#if CONFIG_UNICODE_SAFETY if ((c_1 ^ 0x80) < 0x40) -#endif if (s - 1 != start) { uint8_t c_2 = s[-2]; @@ -46,38 +53,28 @@ u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start) | (unsigned int) (c_1 ^ 0x80); return s - 2; } -#if CONFIG_UNICODE_SAFETY if ((c_2 ^ 0x80) < 0x40) -#endif if (s - 2 != start) { uint8_t c_3 = s[-3]; if (c_3 >= 0xe0 && c_3 < 0xf0 -#if CONFIG_UNICODE_SAFETY && (c_3 >= 0xe1 || c_2 >= 0xa0) - && (c_3 != 0xed || c_2 < 0xa0) -#endif - ) + && (c_3 != 0xed || c_2 < 0xa0)) { *puc = ((unsigned int) (c_3 & 0x0f) << 12) | ((unsigned int) (c_2 ^ 0x80) << 6) | (unsigned int) (c_1 ^ 0x80); return s - 3; } -#if CONFIG_UNICODE_SAFETY if ((c_3 ^ 0x80) < 0x40) -#endif if (s - 3 != start) { uint8_t c_4 = s[-4]; if (c_4 >= 0xf0 && c_4 < 0xf8 -#if CONFIG_UNICODE_SAFETY && (c_4 >= 0xf1 || c_3 >= 0x90) - && (c_4 < 0xf4 || (c_4 == 0xf4 && c_3 < 0x90)) -#endif - ) + && (c_4 < 0xf4 || (c_4 == 0xf4 && c_3 < 0x90))) { *puc = ((unsigned int) (c_4 & 0x07) << 18) | ((unsigned int) (c_3 ^ 0x80) << 12) |