From 71f55ca7309e7d4c2d5bfb59029005680cdba60d Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Tue, 4 Dec 2007 23:08:46 +0000 Subject: [PATCH] handle extra kmaps fixed numerous bugs in kmaptoqe.c: handle \ syntax and report errors. disable HebrewIsraeli.kmap and Kana.kmap because of partial support --- Makefile | 17 +++-- input.c | 27 ++++--- kmap/Spanish.kmap | 2 +- kmaps | Bin 77187 -> 74205 bytes kmaptoqe.c | 187 +++++++++++++++++++++++++++++++++------------- 5 files changed, 161 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index 0a54f28..7fef293 100644 --- a/Makefile +++ b/Makefile @@ -289,7 +289,7 @@ ligtoqe$(EXE): ligtoqe.c $(HOST_CC) $(CFLAGS) -o $@ $< ifdef BUILD_ALL -ligatures: unifont.lig ligtoqe$(EXE) +ligatures: ligtoqe$(EXE) unifont.lig ./ligtoqe unifont.lig $@ endif @@ -299,11 +299,14 @@ endif KMAPS=Arabic.kmap ArmenianEast.kmap ArmenianWest.kmap Chinese-CJ.kmap \ Cyrillic.kmap Czech.kmap DE-RU.kmap Danish.kmap Dutch.kmap \ Esperanto.kmap Ethiopic.kmap French.kmap Georgian.kmap German.kmap \ - Greek.kmap GreekMono.kmap Guarani.kmap Hebrew.kmap HebrewIsraeli.kmap \ + Greek.kmap GreekMono.kmap Guarani.kmap Hebrew.kmap \ Hungarian.kmap \ - KOI8_R.kmap Kana.kmap Lithuanian.kmap Mnemonic.kmap Polish.kmap \ + KOI8_R.kmap Lithuanian.kmap Mnemonic.kmap Polish.kmap \ Russian.kmap SGML.kmap TeX.kmap Troff.kmap VNtelex.kmap \ - Vietnamese.kmap XKB_iso8859-4.kmap + Vietnamese.kmap XKB_iso8859-4.kmap \ + DanishAlternate.kmap GreekBible.kmap Polytonic.kmap Spanish.kmap \ + Thai.kmap VietnameseTelex.kmap Welsh.kmap +# HebrewIsraeli.kmap Kana.kmap # Hangul.kmap Hangul2.kmap Hangul3.kmap Unicode2.kmap #KMAPS_DIR=$(prefix)/share/yudit/data KMAPS_DIR=kmap @@ -313,7 +316,7 @@ kmaptoqe$(EXE): kmaptoqe.c $(HOST_CC) $(CFLAGS) -o $@ $< ifdef BUILD_ALL -kmaps: kmaptoqe$(EXE) $(KMAPS) +kmaps: kmaptoqe$(EXE) $(KMAPS) Makefile ./kmaptoqe $@ $(KMAPS) endif @@ -337,10 +340,10 @@ jistoqe$(EXE): jistoqe.c $(HOST_CC) $(CFLAGS) -o $@ $< ifdef BUILD_ALL -charsetmore.c: cptoqe$(EXE) $(CP) +charsetmore.c: cptoqe$(EXE) $(CP) Makefile ./cptoqe $(CP) > $@ -charsetjis.def: jistoqe$(EXE) $(JIS) +charsetjis.def: jistoqe$(EXE) $(JIS) Makefile ./jistoqe $(JIS) > $@ endif diff --git a/input.c b/input.c index 3011e66..8b7a09b 100644 --- a/input.c +++ b/input.c @@ -178,11 +178,13 @@ the_end: } static int input_method_fd; +static size_t input_method_size; +static void *input_method_map; static void load_input_methods(void) { - char buf[MAX_FILENAME_SIZE], *q; - long file_size; + char buf[MAX_FILENAME_SIZE]; + size_t file_size; int fd, offset; const unsigned char *file_ptr, *p; InputMethod *m; @@ -198,13 +200,17 @@ static void load_input_methods(void) file_size = lseek(fd, 0, SEEK_END); file_ptr = mmap(NULL, file_size, PROT_READ, MAP_SHARED, fd, 0); if ((void*)file_ptr == (void*)MAP_FAILED) { + // XXX: allocate a buffer and read the file in memory fail: + // XXX: print error message close(fd); return; } - if (memcmp(file_ptr, "kmap", 4) != 0) + if (memcmp(file_ptr, "kmap", 4) != 0) { + munmap((void*)file_ptr, file_size); goto fail; + } p = file_ptr + 4; for (;;) { @@ -216,25 +222,22 @@ static void load_input_methods(void) if (m) { m->data = file_ptr + offset; m->input_match = kmap_input; - q = buf; - while (*p != '\0') { - if (q < buf + sizeof(buf) - 1) - *q++ = *p; - p++; - } - *q = '\0'; - p++; - m->name = strdup(buf); + m->name = (const char*)p; register_input_method(m); } + p += strlen((const char *)p); } input_method_fd = fd; + input_method_map = (void *)file_ptr; + input_method_size = file_size; } static void unload_input_methods(void) { if (input_method_fd >= 0) { + munmap((void*)input_method_map, input_method_size); + input_method_map = NULL; close(input_method_fd); input_method_fd = -1; } diff --git a/kmap/Spanish.kmap b/kmap/Spanish.kmap index 24863bd..ab4e74f 100644 --- a/kmap/Spanish.kmap +++ b/kmap/Spanish.kmap @@ -29,7 +29,7 @@ "E-=0x20AC", // € = EURO SIGN "Ct=0x00A2", // ¢ = CENT SIGN "L-=0x00A3", // £ = POUND SIGN -"Y-=00A5", // = YEN SIGN +"Y-=0x00A5", // = YEN SIGN "-: = 0xf7", // ÷ = DIVISION SIGN "S$=0x00A7", // § = SECTION SIGN diff --git a/kmaps b/kmaps index 974927ed66e0e9929b35766bd10a542ddc9140f3..0f9b5b85a5d21626de78e321bcadb8e87c5a004e 100644 GIT binary patch delta 8974 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 W0>D#42oyq~`=9yp8 #include +#ifndef countof +#define countof(a) ((int)(sizeof(a) / sizeof((a)[0]))) +#endif + //#define TEST #define NB_MAX 15000 typedef struct InputEntry { - unsigned char input[10]; + unsigned char input[20]; int len; int output; } InputEntry; @@ -54,7 +58,7 @@ static int sort_func(const void *a1, const void *b1) const InputEntry *b = b1; int val; - if (is_chinese_cj) { + if (gen_table) { val = a->input[0] - b->input[0]; if (val != 0) return val; @@ -155,6 +159,51 @@ static void gen_map(void) put_byte(0); } +static void putcp(int c, int *sp) +{ + switch (c) { + case '=': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + goto x2; + case '\\': + case '"': + case '-': + case '+': + printf("\\%c", c); + *sp = 0; + break; + default: + if (c >= 256) { + if (!*sp) + printf(" "); + printf("0x%04X ", c); + *sp = 1; + break; + } else + if (c <= 0x20 || c >= 0x7F) { + x2: + if (!*sp) + printf(" "); + printf("0x%02X ", c); + *sp = 1; + break; + } else { + printf("%c", c); + *sp = 0; + break; + } + } +} + static int dump_kmap(const char *filename) { FILE *f; @@ -184,7 +233,7 @@ static int dump_kmap(const char *filename) kmap_offsets[nb_kmaps] = off; for (i = 0;; i++) { c = getc(f); - if (c == EOF || i >= (int)sizeof(kmap_names[nb_kmaps])) { + if (c == EOF || i >= countof(kmap_names[nb_kmaps])) { fprintf(stderr, "%s: invalid map name\n", filename); fclose(f); return 1; @@ -216,9 +265,7 @@ static int dump_kmap(const char *filename) pos++; nb_starts = c & 0x7F; is_chinese_cj = c >> 7; - gen_table = !strcmp(kmap_names[n], "Chinese_CJ") || - !strcmp(kmap_names[n], "TeX") || - !strcmp(kmap_names[n], "SGML"); + gen_table = (nb_starts > 0); printf(" nb_starts=%d, is_chinese_cj=%d\n", nb_starts, is_chinese_cj); @@ -243,7 +290,7 @@ static int dump_kmap(const char *filename) x = 0; if (1) { - int len, flag, k, s, last = 0; + int len, flag, k, s, last = 0, sp; s = 0; for (k = 0;; k++) { @@ -251,6 +298,7 @@ static int dump_kmap(const char *filename) input = inputs[k].input; len = 0; + sp = 1; nextc: c = getc(f); @@ -274,7 +322,7 @@ static int dump_kmap(const char *filename) if (len == 0) { printf(" \""); if (gen_table) { - printf("%c", table_val[s]); + putcp(table_val[s], &sp); } } @@ -286,9 +334,7 @@ static int dump_kmap(const char *filename) c |= getc(f) << 0; pos += 2; input[len++] = c; - if (len > 1) - printf(" "); - printf("0x%04X", c); + putcp(c, &sp); if (flag) { last += 1; goto nextk; @@ -307,25 +353,7 @@ static int dump_kmap(const char *filename) } if (c >= 0x20) { input[len++] = c; - switch (c) { - case ' ': - case '=': - case 0x7f: - case '0'...'9': - if (len > 1) - printf(" "); - printf("0x%02X", c); - break; - case '\\': - case '"': - case '-': - case '+': - printf("\\%c", c); - break; - default: - printf("%c", c); - break; - } + putcp(c, &sp); if (flag) { last += 1; goto nextk; @@ -333,9 +361,12 @@ static int dump_kmap(const char *filename) goto nextc; } nextk: - if (is_chinese_cj) - printf(" 0x20"); - printf(" = 0x%04X\",\n", last); + if (is_chinese_cj) { + putcp(' ', &sp); + } + if (!sp) + printf(" "); + printf("= 0x%04X\",\n", last); } } if (pos == kmap_offsets[n]) @@ -368,10 +399,50 @@ static int dump_kmap(const char *filename) return 0; } +static inline void skipspaces(char **pp) { + while (isspace((unsigned char)**pp)) + ++*pp; +} + +static int getcp(char *p, char **pp) +{ + if (*p == '\0') { + return -1; + } else + if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { + return strtoul(p, pp, 0); + } else + if (*p == '\\') { + p++; + if (*p == 't') { + *pp = p + 1; + return '\t'; + } else + if (p[0] >= '0' && p[0] <= '3' + && p[1] >= '0' && p[1] <= '7' + && p[2] >= '0' && p[2] <= '7') { + *pp = p + 3; + return ((p[0] - '0') << 6) | ((p[1] - '0') << 3) | + ((p[2] - '0') << 0); + } else { + *pp = p + 1; + return *p; + } + } else + if ((*p & 0xe0) == 0xc0 && (p[1] & 0xc0) == 0x80) { + /* UTF-8 character */ + *pp = p + 2; + return ((*p - 0xc0) << 6) | ((p[1] - 0x80) << 0); + } else { + *pp = p + 1; + return *p; + } +} + int main(int argc, char **argv) { char *filename; - int i, j, k, col, line_num; + int i, j, k, col, line_num, len; FILE *f; char line[1024], *p; unsigned char *q; @@ -421,7 +492,9 @@ int main(int argc, char **argv) /* special compression for CJ */ is_chinese_cj = !strcmp(name, "Chinese_CJ"); gen_table = !strcmp(name, "Chinese_CJ") || - !strcmp(name, "TeX") || !strcmp(name, "SGML"); + !strcmp(name, "TeX") || + !strcmp(name, "Troff") || + !strcmp(name, "SGML"); col = 0; nb_inputs = 0; @@ -431,34 +504,44 @@ int main(int argc, char **argv) break; line_num++; p = line; - if (*p == '/') + skipspaces(&p); + if (*p == '\0' || *p == '/' || *p == '#') continue; - while (*p != '\0' && *p != '\"') p++; if (*p != '\"') - continue; + goto invalid; p++; + len = 0; q = inputs[nb_inputs].input; for (;;) { - while (isspace(*p)) - p++; - if (*p == '=') + skipspaces(&p); + if (*p == '=' && p[1] != '=') break; - if (p[0] == '0' && p[1] == 'x') { - c = strtoul(p, &p, 0); - } else { - c = *p++; - } + c = getcp(p, &p); + if (c < 0) + goto invalid; if (c >= 256) { - fprintf(stderr, "%s:%d: Invalid char %x %c\n", - filename, line_num, c, c); + fprintf(stderr, "%s:%d: Invalid char 0x%x\n", + filename, line_num, c); + goto skip; } - // BUG! no handling of '\\' - *q++ = c; + if (len >= countof(inputs[nb_inputs].input)) + goto invalid; + q[len++] = c; } - inputs[nb_inputs].len = q - inputs[nb_inputs].input; + inputs[nb_inputs].len = len; p++; - inputs[nb_inputs].output = strtoul(p, NULL, 0); + skipspaces(&p); + c = getcp(p, &p); + skipspaces(&p); + if (c < 0 || *p != '"') + goto invalid; + inputs[nb_inputs].output = c; nb_inputs++; + continue; + invalid: + fprintf(stderr, "%s:%d: Invalid mapping: %s\n", + filename, line_num, line); + skip:; } qsort(inputs, nb_inputs, sizeof(InputEntry), sort_func);