[BACK]Return to ucs2.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / lib

Diff for /embedaddon/libiconv/lib/ucs2.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2021/03/17 13:38:46
Line 1 Line 1
 /*  /*
 * Copyright (C) 1999-2001, 2008 Free Software Foundation, Inc. * Copyright (C) 1999-2001, 2008, 2011, 2016 Free Software Foundation, Inc.
  * This file is part of the GNU LIBICONV Library.   * This file is part of the GNU LIBICONV Library.
  *   *
  * The GNU LIBICONV Library is free software; you can redistribute it   * The GNU LIBICONV Library is free software; you can redistribute it
Line 14 Line 14
  *   *
  * You should have received a copy of the GNU Library General Public   * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.   * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
 * If not, write to the Free Software Foundation, Inc., 51 Franklin Street, * If not, see <https://www.gnu.org/licenses/>.
 * Fifth Floor, Boston, MA 02110-1301, USA. 
  */   */
   
 /*  /*
Line 26 Line 25
    in the stream, not just at the beginning. The default is big-endian. */     in the stream, not just at the beginning. The default is big-endian. */
 /* The state is 0 if big-endian, 1 if little-endian. */  /* The state is 0 if big-endian, 1 if little-endian. */
 static int  static int
ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {  {
   state_t state = conv->istate;    state_t state = conv->istate;
   int count = 0;    int count = 0;
  for (; n >= 2;) {  for (; n >= 2 && count <= RET_COUNT_MAX && count <= INT_MAX-2;) {
     ucs4_t wc = (state ? s[0] + (s[1] << 8) : (s[0] << 8) + s[1]);      ucs4_t wc = (state ? s[0] + (s[1] << 8) : (s[0] << 8) + s[1]);
     s += 2; n -= 2; count += 2;  
     if (wc == 0xfeff) {      if (wc == 0xfeff) {
     } else if (wc == 0xfffe) {      } else if (wc == 0xfffe) {
       state ^= 1;        state ^= 1;
Line 42  ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned  Line 40  ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned 
     } else {      } else {
       *pwc = wc;        *pwc = wc;
       conv->istate = state;        conv->istate = state;
      return count;      return count+2;
     }      }
       s += 2; n -= 2; count += 2;
   }    }
   conv->istate = state;    conv->istate = state;
   return RET_TOOFEW(count);    return RET_TOOFEW(count);
Line 54  ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned  Line 53  ucs2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned 
    "ISO/IEC 10646-1:1993(E) specifies that when characters the UCS-2 form are     "ISO/IEC 10646-1:1993(E) specifies that when characters the UCS-2 form are
     serialized as octets, that the most significant octet appear first." */      serialized as octets, that the most significant octet appear first." */
 static int  static int
ucs2_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)ucs2_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n)
 {  {
   if (wc < 0x10000 && wc != 0xfffe && !(wc >= 0xd800 && wc < 0xe000)) {    if (wc < 0x10000 && wc != 0xfffe && !(wc >= 0xd800 && wc < 0xe000)) {
     if (n >= 2) {      if (n >= 2) {
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>