From b97e542708b7c9ebd09991420fbbf6785d5ccd87 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 17 Sep 2005 15:34:58 +0000 Subject: [PATCH] Reasonably complete ISO 2022 support. Huge and hairy, but it seems to largely work. It might even be useful for something. git-svn-id: svn://svn.tartarus.org/sgt/charset@6320 cda61777-01e9-0310-a592-d414129be87e --- Makefile | 6 + charset.h | 3 + enum.c | 1 + iso2022.c | 534 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ iso2022s.c | 4 - localenc.c | 2 + utf16.c | 2 +- 7 files changed, 547 insertions(+), 5 deletions(-) create mode 100644 iso2022.c diff --git a/Makefile b/Makefile index 400d39c..e488283 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ LIBCHARSET_OBJS = \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)fromucs.o \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)gb2312.o \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)hz.o \ + $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)iso2022.o \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)iso2022s.o \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)istate.o \ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)jisx0208.o \ @@ -112,6 +113,11 @@ $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)hz.o: \ $(LIBCHARSET_SRCDIR)hz.c $(CC) $(CFLAGS) $(MD) -c -o $@ $< +$(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)iso2022.o: \ + $(LIBCHARSET_SRCDIR)iso2022.c \ + $(LIBCHARSET_OBJDIR)sbcsdat.h + $(CC) $(CFLAGS) $(MD) -c -o $@ $< + $(LIBCHARSET_OBJDIR)$(LIBCHARSET_OBJPFX)iso2022s.o: \ $(LIBCHARSET_SRCDIR)iso2022s.c \ $(LIBCHARSET_OBJDIR)sbcsdat.h diff --git a/charset.h b/charset.h index ebaafc9..4874023 100644 --- a/charset.h +++ b/charset.h @@ -86,6 +86,9 @@ typedef enum { CS_CP949, CS_PDF, CS_CTEXT, + CS_BS4730, + CS_DEC_GRAPHICS, + CS_ISO2022 } charset_t; typedef struct { diff --git a/enum.c b/enum.c index 9339c77..5a7f0f0 100644 --- a/enum.c +++ b/enum.c @@ -19,6 +19,7 @@ #include "utf7.c" #include "utf16.c" #include "euc.c" +#include "iso2022.c" #include "iso2022s.c" #include "big5enc.c" #include "shiftjis.c" diff --git a/iso2022.c b/iso2022.c new file mode 100644 index 0000000..8ef82c6 --- /dev/null +++ b/iso2022.c @@ -0,0 +1,534 @@ +/* + * iso2022.c - support for ISO/IEC 2022 (alias ECMA-35). + * + * This isn't a complete implementation of ISO/IEC 2022, but it's + * close. It only handles decoding, because a fully general encoder + * isn't really useful. It can decode 8-bit and 7-bit versions, with + * support for single-byte and multi-byte character sets, all four + * containers (G0, G1, G2, and G3), using both single-shift and + * locking-shift sequences. + * + * The general principle is that any valid ISO/IEC 2022 sequence + * should either be correctly decoded or should emit an ERROR. The + * only exception to this is that the C0 and C1 sets are fixed as + * those of ISO/IEC 6429. Escape sequences for designating control + * sets are passed through, so a post-processor could fix them up if + * necessary. + * + * DOCS is not currently supported. It will be one day. + */ + +#ifndef ENUM_CHARSETS + +#include + +#include "charset.h" +#include "internal.h" +#include "sbcsdat.h" + +#define LS1 (0x0E) +#define LS0 (0x0F) +#define ESC (0x1B) +#define SS2 (0x8E) +#define SS3 (0x8F) + +enum {S4, S6, M4, M6}; + +static long int null_dbcs_to_unicode(int, int); + +const struct iso2022_subcharset { + char type, i, f; + int offset; + const sbcs_data *sbcs_base; + long int (*dbcs_fn)(int, int); +} iso2022_subcharsets[] = { + { S4, 0, 'B', 0x00, &sbcsdata_CS_ASCII }, + + { S4, 0, '<', 0x80, &sbcsdata_CS_DEC_MCS }, + { S4, 0, 'I', 0x80, &sbcsdata_CS_JISX0201 }, + { S4, 0, 'J', 0x00, &sbcsdata_CS_JISX0201 }, + { S4, 0, '~' }, + { S6, 0, 'A', 0x80, &sbcsdata_CS_ISO8859_1 }, + { S6, 0, 'B', 0x80, &sbcsdata_CS_ISO8859_2 }, + { S6, 0, 'C', 0x80, &sbcsdata_CS_ISO8859_3 }, + { S6, 0, 'D', 0x80, &sbcsdata_CS_ISO8859_4 }, + { S6, 0, 'F', 0x80, &sbcsdata_CS_ISO8859_7 }, + { S6, 0, 'G', 0x80, &sbcsdata_CS_ISO8859_6 }, + { S6, 0, 'H', 0x80, &sbcsdata_CS_ISO8859_8 }, + { S6, 0, 'L', 0x80, &sbcsdata_CS_ISO8859_5 }, + { S6, 0, 'M', 0x80, &sbcsdata_CS_ISO8859_9 }, + { S6, 0, 'T', 0x80, &sbcsdata_CS_ISO8859_11 }, + { S6, 0, 'V', 0x80, &sbcsdata_CS_ISO8859_10 }, + { S6, 0, 'Y', 0x80, &sbcsdata_CS_ISO8859_13 }, + { S6, 0, '_', 0x80, &sbcsdata_CS_ISO8859_14 }, + { S6, 0, 'b', 0x80, &sbcsdata_CS_ISO8859_15 }, + { S6, 0, 'f', 0x80, &sbcsdata_CS_ISO8859_16 }, + { S6, 0, '~' }, /* empty 96-set */ +#if 0 + { M4, 0, '@' }, /* JIS C 6226-1978 */ +#endif + { M4, 0, 'A', -0x21, 0, &gb2312_to_unicode }, + { M4, 0, 'B', -0x21, 0, &jisx0208_to_unicode }, + { M4, 0, 'C', -0x21, 0, &ksx1001_to_unicode }, + { M4, 0, 'D', -0x21, 0, &jisx0212_to_unicode }, + { M4, 0, '~', 0, 0, &null_dbcs_to_unicode }, /* empty 94^n-set */ + { M6, 0, '~', 0, 0, &null_dbcs_to_unicode }, /* empty 96^n-set */ +}; + +static long int null_dbcs_to_unicode(int r, int c) +{ + return ERROR; +} + +/* States, or "what we're currently accumulating". */ +enum { + IDLE, /* None of the below */ + SS2CHAR, /* Accumulating a character after SS2 */ + SS3CHAR, /* Accumulating a character after SS3 */ + ESCSEQ, /* Accumulating an escape sequence */ + ESCDROP, /* Discarding an escape sequence */ + ESCPASS /* Passing through an escape sequence */ +}; + +#if 0 +#include +static void dump_state(charset_state *s) +{ + unsigned s0 = s->s0, s1 = s->s1; + char const * const modes[] = { "IDLE", "SS2CHAR", "SS3CHAR", + "ESCSEQ", "ESCDROP", "ESCPASS" }; + + fprintf(stderr, "s0: %s", modes[s0 >> 29]); + fprintf(stderr, " %02x %02x %02x ", (s0 >> 16) & 0xff, (s0 >> 8) & 0xff, + s0 & 0xff); + fprintf(stderr, "s1: LS%d LS%dR", (s1 >> 30) & 3, (s1 >> 28) & 3); + fprintf(stderr, " %d %d %d %d\n", s1 & 0x7f, (s1 >> 7) & 0x7f, + (s1 >> 14) & 0x7f, (s1 >> 21) & 0x7f); +} +#endif + +static void designate(charset_state *state, int container, + int type, int ibyte, int fbyte) +{ + unsigned long i; + + assert(container >= 0 && container <= 3); + assert(type == S4 || type == S6 || type == M4 || type == M6); + + for (i = 0; i <= lenof(iso2022_subcharsets); i++) { + if (iso2022_subcharsets[i].type == type && + iso2022_subcharsets[i].i == ibyte && + iso2022_subcharsets[i].f == fbyte) { + state->s1 &= ~(0x7fL << (container * 7)); + state->s1 |= (i << (container * 7)); + return; + } + } + /* + * If we don't find the charset, invoke the empty one, so we + * output ERROR rather than garbage. + */ + designate(state, container, type, 0, '~'); +} + +static void read_iso2022(charset_spec const *charset, long int input_chr, + charset_state *state, + void (*emit)(void *ctx, long int output), + void *emitctx) +{ + +/* dump_state(state); */ + /* + * We've got 64 bits of state to play with. + * + * Locking-shift state: 2 bits each GL/GR + * Single-shift state: 2 bits + * Charset designation state: n bits each G0/G1/G2/G3 + * MBCS/esc seq accumulation: 14 bits (assume max 4-byte sets) + * MBCS state: 2 bits (off, ESC, GL, GR) + * For no good reason, put long-term state in s1, short term in s0. + * + * s0[31:29] = state enum + * s0[24:0] = accumulated bytes + * s1[31:30] = GL locking-shift state + * s1[29:28] = GR locking-shift state + * s1[27:21] = G3 charset + * s1[20:14] = G2 charset + * s1[13:7] = G1 charset + * s1[6:0] = G0 charset + */ + +#define LEFT 30 +#define RIGHT 28 +#define LOCKING_SHIFT(n,side) \ + (state->s1 = (state->s1 & ~(3L<<(side))) | ((n ## L)<<(side))) +#define MODE ((state->s0 & 0xe0000000L) >> 29) +#define ENTER_MODE(m) (state->s0 = (state->s0 & ~0xe0000000L) | ((m)<<29)) +#define SINGLE_SHIFT(n) ENTER_MODE(SS2CHAR - 2 + (n)) +#define ASSERT_IDLE do { \ + if (state->s0 != 0) emit(emitctx, ERROR); \ + state->s0 = 0; \ +} while (0) + + if (state->s1 == 0) { + /* + * Since there's no LS0R, this means we must just have started. + * Set up a sane initial state (LS0, LS1R, ASCII in G0/G1/G2/G3). + */ + LOCKING_SHIFT(0, LEFT); + LOCKING_SHIFT(1, RIGHT); + designate(state, 0, S4, 0, 'B'); + designate(state, 1, S4, 0, 'B'); + designate(state, 2, S4, 0, 'B'); + designate(state, 3, S4, 0, 'B'); + } + + if ((input_chr & 0x60) == 0x00) { + /* C0 or C1 control */ + ASSERT_IDLE; + switch (input_chr) { + case ESC: + ENTER_MODE(ESCSEQ); + break; + case LS0: + LOCKING_SHIFT(0, LEFT); + break; + case LS1: + LOCKING_SHIFT(1, LEFT); + break; + case SS2: + SINGLE_SHIFT(2); + break; + case SS3: + SINGLE_SHIFT(3); + break; + default: + emit(emitctx, input_chr); + break; + } + } else if ((input_chr & 0x80) || MODE < ESCSEQ) { + int is_gl = 0; + struct iso2022_subcharset const *subcs; + unsigned container; + long input_7bit; + /* + * Actual data. + * Force idle state if we're in mid escape sequence, or in a + * multi-byte character with a different top bit. + */ + if (MODE >= ESCSEQ || + ((state->s0 & 0x00ff0000L) != 0 && + (((state->s0 >> 16) ^ input_chr) & 0x80))) + ASSERT_IDLE; + if (MODE == SS2CHAR || MODE == SS3CHAR) /* Single-shift */ + container = MODE - SS2CHAR + 2; + else if (input_chr >= 0x80) /* GR */ + container = (state->s1 >> 28) & 3; + else { /* GL */ + container = state->s1 >> 30; + is_gl = 1; + } + input_7bit = input_chr & ~0x80; + subcs = &iso2022_subcharsets[(state->s1 >> (container * 7)) & 0x7f]; + if ((subcs->type == S4 || subcs->type == M4) && + (input_7bit == 0x20 || input_7bit == 0x7f)) { + /* characters not in 94-char set */ + if (is_gl) emit(emitctx, input_7bit); + else emit(emitctx, ERROR); + } else if (subcs->type == M4 || subcs->type == M6) { + if ((state->s0 & 0x00ff0000L) == 0) { + state->s0 |= input_chr << 16; + return; + } else { + emit(emitctx, + subcs->dbcs_fn(((state->s0 >> 16) & 0x7f) + subcs->offset, + input_7bit + subcs->offset)); + } + } else { + if ((state->s0 & 0x00ff0000L) != 0) + emit(emitctx, ERROR); + emit(emitctx, subcs->sbcs_base ? + sbcs_to_unicode(subcs->sbcs_base, input_7bit + subcs->offset): + ERROR); + } + state->s0 = 0; + } else { + unsigned i1, i2; + if (MODE == ESCPASS) { + emit(emitctx, input_chr); + if ((input_chr & 0xf0) != 0x20) + ENTER_MODE(IDLE); + return; + } + + /* + * Intermediate bytes shall be any of the 16 positions of + * column 02 of the code table; they are denoted by the symbol + * I. + */ + if ((input_chr & 0xf0) == 0x20) { + if (((state->s0 >> 16) & 0xff) == 0) + state->s0 |= input_chr << 16; + else if (((state->s0 >> 8) & 0xff) == 0) + state->s0 |= input_chr << 8; + else { + /* Long escape sequence. Switch to ESCPASS or ESCDROP. */ + i1 = (state->s0 >> 16) & 0xff; + i2 = (state->s0 >> 8) & 0xff; + switch (i1) { + case '(': case ')': case '*': case '+': + case '-': case '.': case '/': + case '$': + ENTER_MODE(ESCDROP); + break; + default: + emit(emitctx, ESC); + emit(emitctx, i1); + emit(emitctx, i2); + emit(emitctx, input_chr); + state->s0 = 0; + ENTER_MODE(ESCPASS); + break; + } + } + return; + } + + /* + * Final bytes shall be any of the 79 positions of columns 03 + * to 07 of the code table excluding position 07/15; they are + * denoted by the symbol F. + */ + i1 = (state->s0 >> 16) & 0xff; + i2 = (state->s0 >> 8) & 0xff; + if (MODE == ESCDROP) + input_chr = 0; /* Make sure it won't match. */ + state->s0 = 0; + switch (i1) { + case 0: /* No intermediate bytes */ + switch (input_chr) { + case 'N': /* SS2 */ + SINGLE_SHIFT(2); + break; + case 'O': /* SS3 */ + SINGLE_SHIFT(3); + break; + case 'n': /* LS2 */ + LOCKING_SHIFT(2, LEFT); + break; + case 'o': /* LS3 */ + LOCKING_SHIFT(3, LEFT); + break; + case '|': /* LS3R */ + LOCKING_SHIFT(3, RIGHT); + break; + case '}': /* LS2R */ + LOCKING_SHIFT(2, RIGHT); + break; + case '~': /* LS1R */ + LOCKING_SHIFT(1, RIGHT); + break; + default: + /* Unsupported escape sequence. Spit it back out. */ + emit(emitctx, ESC); + emit(emitctx, input_chr); + } + break; + case ' ': /* ACS */ + /* + * Various coding structure facilities specify that designating + * a code element also invokes it. As far as I can see, invoking + * it now will have the same practical effect, since those + * facilities also ban the use of locking shifts. + */ + switch (input_chr) { + case 'A': /* G0 element used and invoked into GL */ + LOCKING_SHIFT(0, LEFT); + break; + case 'C': /* G0 in GL, G1 in GR */ + case 'D': /* Ditto, at least for 8-bit codes */ + case 'L': /* ISO 4873 (ECMA-43) level 1 */ + case 'M': /* ISO 4873 (ECMA-43) level 2 */ + LOCKING_SHIFT(0, LEFT); + LOCKING_SHIFT(1, RIGHT); + break; + } + break; + case '&': /* IRR */ + /* + * IRR (Identify Revised Registration) is ignored here, + * since any revised registration must be + * upward-compatible with the old one, so either we'll + * support the new one or we'll emit ERROR when we run + * into a new character. In either case, there's nothing + * to be done here. + */ + break; + case '(': /* GZD4 */ case ')': /* G1D4 */ + case '*': /* G2D4 */ case '+': /* G3D4 */ + designate(state, i1 - '(', S4, i2, input_chr); + break; + case '-': /* G1D6 */ case '.': /* G2D6 */ case '/': /* G3D6 */ + designate(state, i1 - ',', S6, i2, input_chr); + break; + case '$': /* G?DM? */ + switch (i2) { + case 0: /* Obsolete version of GZDM4 */ + i2 = '('; + case '(': /* GZDM4 */ case ')': /* G1DM4 */ + case '*': /* G2DM4 */ case '+': /* G3DM4 */ + designate(state, i2 - '(', M4, 0, input_chr); + break; + case '-': /* G1DM6 */ + case '.': /* G2DM6 */ case '/': /* G3DM6 */ + designate(state, i2 - ',', M6, 0, input_chr); + break; + default: + emit(emitctx, ERROR); + break; + } + case '%': /* DOCS */ + /* FIXME */ + break; + default: + /* Unsupported nF escape sequence. Re-emit it. */ + emit(emitctx, ESC); + emit(emitctx, i1); + if (i2) emit(emitctx, i2); + emit(emitctx, input_chr); + break; + } + } +} + +const charset_spec charset_CS_ISO2022 = { + CS_ISO2022, read_iso2022, NULL, NULL +}; + +#ifdef TESTMODE + +#include +#include +#include + +int total_errs = 0; + +void iso2022_emit(void *ctx, long output) +{ + wchar_t **p = (wchar_t **)ctx; + *(*p)++ = output; +} + +void iso2022_read_test(int line, char *input, int inlen, ...) +{ + va_list ap; + wchar_t *p, str[512]; + int i; + charset_state state; + unsigned long l; + + state.s0 = state.s1 = 0; + p = str; + + for (i = 0; i < inlen; i++) + read_iso2022(NULL, input[i] & 0xFF, &state, iso2022_emit, &p); + + va_start(ap, inlen); + l = 0; + for (i = 0; i < p - str; i++) { + l = va_arg(ap, long int); + if (l == -1) { + printf("%d: correct string shorter than output\n", line); + total_errs++; + break; + } + if (l != str[i]) { + printf("%d: char %d came out as %08x, should be %08lx\n", + line, i, str[i], l); + total_errs++; + } + } + if (l != -1) { + l = va_arg(ap, long int); + if (l != -1) { + printf("%d: correct string longer than output\n", line); + total_errs++; + } + } + va_end(ap); +} + +/* Macro to concoct the first three parameters of iso2022_read_test. */ +#define TESTSTR(x) __LINE__, x, lenof(x) + +int main(void) +{ + printf("read tests beginning\n"); + /* Simple test (Emacs sample text for Japanese, in ISO-2022-JP) */ + iso2022_read_test(TESTSTR("Japanese (\x1b$BF|K\\8l\x1b(B)\t" + "\x1b$B$3$s$K$A$O\x1b(B, " + "\x1b$B%3%s%K%A%O\x1b(B\n"), + 'J','a','p','a','n','e','s','e',' ','(', + 0x65E5, 0x672C, 0x8A9E, ')', '\t', + 0x3053, 0x3093, 0x306b, 0x3061, 0x306f, ',', ' ', + 0x30b3, 0x30f3, 0x30cb, 0x30c1, 0x30cf, '\n', 0, -1); + /* Same thing in EUC-JP (with designations, and half-width katakana) */ + iso2022_read_test(TESTSTR("\x1b$)B\x1b*I\x1b$+D" + "Japanese (\xc6\xfc\xcb\xdc\xb8\xec)\t" + "\xa4\xb3\xa4\xf3\xa4\xcb\xa4\xc1\xa4\xcf, " + "\x8e\xba\x8e\xdd\x8e\xc6\x8e\xc1\x8e\xca\n"), + 'J','a','p','a','n','e','s','e',' ','(', + 0x65E5, 0x672C, 0x8A9E, ')', '\t', + 0x3053, 0x3093, 0x306b, 0x3061, 0x306f, ',', ' ', + 0xff7a, 0xff9d, 0xff86, 0xff81, 0xff8a, '\n', 0, -1); + /* Multibyte single-shift */ + iso2022_read_test(TESTSTR("\x1b$)B\x1b*I\x1b$+D\x8f\"/!"), + 0x02D8, '!', 0, -1); + /* Non-existent SBCS */ + iso2022_read_test(TESTSTR("\x1b(!Zfnord\n"), + ERROR, ERROR, ERROR, ERROR, ERROR, '\n', 0, -1); + /* Pass-through of ordinary escape sequences, including a long one */ + iso2022_read_test(TESTSTR("\x1b""b\x1b#5\x1b#!!!5"), + 0x1B, 'b', 0x1B, '#', '5', + 0x1B, '#', '!', '!', '!', '5', 0, -1); + /* Non-existent DBCS (also 5-byte escape sequence) */ + iso2022_read_test(TESTSTR("\x1b$(!Bfnord!"), + ERROR, ERROR, ERROR, 0, -1); + /* Incomplete DB characters */ + iso2022_read_test(TESTSTR("\x1b$B(,(\x1b(BHi\x1b$B(,(\n"), + 0x2501, ERROR, 'H', 'i', 0x2501, ERROR, '\n', 0, -1); + iso2022_read_test(TESTSTR("\x1b$)B\x1b*I\x1b$+D\xa4""B"), + ERROR, 'B', 0, -1); + iso2022_read_test(TESTSTR("\x1b$)B\x1b*I\x1b$+D\x0e\x1b|$\xa2\xaf"), + ERROR, 0x02D8, 0, -1); + /* Incomplete escape sequence */ + iso2022_read_test(TESTSTR("\x1b\n"), ERROR, '\n', 0, -1); + iso2022_read_test(TESTSTR("\x1b-A\x1b~\x1b\xa1"), ERROR, 0xa1, 0, -1); + /* Incomplete single-shift */ + iso2022_read_test(TESTSTR("\x8e\n"), ERROR, '\n', 0, -1); + iso2022_read_test(TESTSTR("\x1b$*B\x8e(\n"), ERROR, '\n', 0, -1); + /* Corner cases (02/00 and 07/15) */ + iso2022_read_test(TESTSTR("\x1b(B\x20\x7f"), 0x20, 0x7f, 0, -1); + iso2022_read_test(TESTSTR("\x1b(I\x20\x7f"), 0x20, 0x7f, 0, -1); + iso2022_read_test(TESTSTR("\x1b$B\x20\x7f"), 0x20, 0x7f, 0, -1); + iso2022_read_test(TESTSTR("\x1b-A\x0e\x20\x7f"), 0xa0, 0xff, 0, -1); + iso2022_read_test(TESTSTR("\x1b$-~\x0e\x20\x7f"), ERROR, 0, -1); + iso2022_read_test(TESTSTR("\x1b)B\xa0\xff"), ERROR, ERROR, 0, -1); + iso2022_read_test(TESTSTR("\x1b)I\xa0\xff"), ERROR, ERROR, 0, -1); + iso2022_read_test(TESTSTR("\x1b$)B\xa0\xff"), ERROR, ERROR, 0, -1); + iso2022_read_test(TESTSTR("\x1b-A\x1b~\xa0\xff"), 0xa0, 0xff, 0, -1); + iso2022_read_test(TESTSTR("\x1b$-~\x1b~\xa0\xff"), ERROR, 0, -1); + /* Designate control sets */ + iso2022_read_test(TESTSTR("\x1b!@"), 0x1b, '!', '@', 0, -1); + printf("read tests completed\n"); + printf("total: %d errors\n", total_errs); + return (total_errs != 0); +} + +#endif /* TESTMODE */ + +#else /* ENUM_CHARSETS */ + +ENUM_CHARSET(CS_ISO2022) + +#endif diff --git a/iso2022s.c b/iso2022s.c index 000c57e..3cf8fa4 100644 --- a/iso2022s.c +++ b/iso2022s.c @@ -1,9 +1,5 @@ /* * iso2022s.c - support for ISO-2022 subset encodings. - * - * (The `s' suffix on the filename is there to leave `iso2022.c' - * free for the unlikely event that I ever attempt to implement - * _full_ ISO-2022 in this library!) */ #ifndef ENUM_CHARSETS diff --git a/localenc.c b/localenc.c index 95b540c..4be2a39 100644 --- a/localenc.c +++ b/localenc.c @@ -115,6 +115,8 @@ static const struct { { "COMPOUND TEXT", CS_CTEXT, 0 }, { "COMPOUNDTEXT", CS_CTEXT, 0 }, { "CTEXT", CS_CTEXT, 0 }, + { "ISO-2022", CS_ISO2022, 1 }, + { "ISO2022", CS_ISO2022, 0 }, }; const char *charset_to_localenc(int charset) diff --git a/utf16.c b/utf16.c index a1af88b..f610c35 100644 --- a/utf16.c +++ b/utf16.c @@ -194,7 +194,7 @@ static int write_utf16(charset_spec const *charset, long int input_chr, return TRUE; } -static const struct utf16 utf16_bigendian = { 0x20000 }; +static struct utf16 const utf16_bigendian = { 0x20000 }; static const struct utf16 utf16_littleendian = { 0x10000 }; static const struct utf16 utf16_variable_endianness = { 0x30000 }; -- 2.11.0