comparison src/coding.c @ 23564:6eb3e346d1fd

(DECODE_CHARACTER_ASCII): Check validity of inserted code. (DECODE_CHARACTER_DIMENSION1): Likewise. (DECODE_CHARACTER_DIMENSION2): Likewise. (decode_coding_sjis_big5): Check the 2nd byte of SJIS correctly.

23563:18c5f58b70b5

  do {						\
    if (COMPOSING_P (coding->composing))	\
      {						\
	*dst++ = 0xA0, *dst++ = (c) | 0x80;	\
	coding->composed_chars++;		\
      }						\
    else					\
      {						\
	*dst++ = (c);				\
	coding->produced_char++;		\
      }						\
  } while (0)

/* Decode one DIMENSION1 character whose charset is CHARSET and whose
   position-code is C.  */

	coding->produced_char++;					\
      }									\
    if (leading_code = CHARSET_LEADING_CODE_EXT (charset))		\
      *dst++ = leading_code;						\
    *dst++ = (c) | 0x80;						\
  } while (0)

/* Decode one DIMENSION2 character whose charset is CHARSET and whose
   position-codes are C1 and C2.  */

#define DECODE_CHARACTER_DIMENSION2(charset, c1, c2)	\
  do {							\
    DECODE_CHARACTER_DIMENSION1 (charset, c1);		\
    *dst++ = (c2) | 0x80;				\
  } while (0)


/*** 1. Preamble ***/

   --- CODE RANGE of SJIS ---
   (character set)	(range)
   ASCII		0x00 .. 0x7F
   KATAKANA-JISX0201	0xA0 .. 0xDF
   JISX0208 (1st byte)	0x80 .. 0x9F and 0xE0 .. 0xEF
	    (2nd byte)	0x40 .. 0xFF
   -------------------------------

*/

/* BIG5 is a coding system encoding two character sets: ASCII and

	    {
	      if (c1 < 0xA0 || (c1 >= 0xE0 && c1 < 0xF0))
		{
		  /* SJIS -> JISX0208 */
		  ONE_MORE_BYTE (c2);
		  if (c2 >= 0x40)
		    {
		      DECODE_SJIS (c1, c2, c3, c4);
		      DECODE_SJIS_BIG5_CHARACTER (charset_jisx0208, c3, c4);
		    }
		  else

23564:6eb3e346d1fd

  do {						\
    if (COMPOSING_P (coding->composing))	\
      {						\
	*dst++ = 0xA0, *dst++ = (c) | 0x80;	\
	coding->composed_chars++;		\
	if (((c) | 0x80) < 0xA0)		\
	  coding->fake_multibyte = 1;		\
      }						\
    else					\
      {						\
	*dst++ = (c);				\
	coding->produced_char++;		\
	if ((c) >= 0x80)			\
	  coding->fake_multibyte = 1;		\
      }						\
  } while (0)

/* Decode one DIMENSION1 character whose charset is CHARSET and whose
   position-code is C.  */

	coding->produced_char++;					\
      }									\
    if (leading_code = CHARSET_LEADING_CODE_EXT (charset))		\
      *dst++ = leading_code;						\
    *dst++ = (c) | 0x80;						\
    if (((c) | 0x80)  < 0xA0)						\
      coding->fake_multibyte = 1; 					\
  } while (0)

/* Decode one DIMENSION2 character whose charset is CHARSET and whose
   position-codes are C1 and C2.  */

#define DECODE_CHARACTER_DIMENSION2(charset, c1, c2)	\
  do {							\
    DECODE_CHARACTER_DIMENSION1 (charset, c1);		\
    *dst++ = (c2) | 0x80;				\
    if (((c2) | 0x80) < 0xA0)				\
      coding->fake_multibyte = 1;			\
  } while (0)


/*** 1. Preamble ***/

   --- CODE RANGE of SJIS ---
   (character set)	(range)
   ASCII		0x00 .. 0x7F
   KATAKANA-JISX0201	0xA0 .. 0xDF
   JISX0208 (1st byte)	0x80 .. 0x9F and 0xE0 .. 0xEF
	    (2nd byte)	0x40 .. 0x7E and 0x80 .. 0xFC
   -------------------------------

*/

/* BIG5 is a coding system encoding two character sets: ASCII and

	    {
	      if (c1 < 0xA0 || (c1 >= 0xE0 && c1 < 0xF0))
		{
		  /* SJIS -> JISX0208 */
		  ONE_MORE_BYTE (c2);
		  if (c2 >= 0x40 && c2 != 0x7F && c2 <= 0xFC)
		    {
		      DECODE_SJIS (c1, c2, c3, c4);
		      DECODE_SJIS_BIG5_CHARACTER (charset_jisx0208, c3, c4);
		    }
		  else