=================================================================== RCS file: /cvs/mandoc/chars.c,v retrieving revision 1.21 retrieving revision 1.42 diff -u -p -r1.21 -r1.42 --- mandoc/chars.c 2010/07/16 22:33:30 1.21 +++ mandoc/chars.c 2011/05/15 15:47:46 1.42 @@ -1,6 +1,7 @@ -/* $Id: chars.c,v 1.21 2010/07/16 22:33:30 kristaps Exp $ */ +/* $Id: chars.c,v 1.42 2011/05/15 15:47:46 kristaps Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -19,12 +20,12 @@ #endif #include +#include #include #include #include #include "mandoc.h" -#include "chars.h" #define PRINT_HI 126 #define PRINT_LO 32 @@ -32,9 +33,7 @@ struct ln { struct ln *next; const char *code; - size_t codesz; const char *ascii; - size_t asciisz; int unicode; int type; #define CHARS_CHAR (1 << 0) @@ -42,46 +41,40 @@ struct ln { #define CHARS_BOTH (CHARS_CHAR | CHARS_STRING) }; -#define LINES_MAX 370 +#define LINES_MAX 353 -#define CHAR(in, insz, ch, chsz, code) \ - { NULL, (in), (insz), (ch), (chsz), (code), CHARS_CHAR }, -#define STRING(in, insz, ch, chsz, code) \ - { NULL, (in), (insz), (ch), (chsz), (code), CHARS_STRING }, -#define BOTH(in, insz, ch, chsz, code) \ - { NULL, (in), (insz), (ch), (chsz), (code), CHARS_BOTH }, +#define CHAR(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_CHAR }, +#define STRING(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_STRING }, +#define BOTH(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_BOTH }, #define CHAR_TBL_START static struct ln lines[LINES_MAX] = { #define CHAR_TBL_END }; #include "chars.in" -struct tbl { - enum chars type; +struct mchars { struct ln **htab; }; static inline int match(const struct ln *, const char *, size_t, int); -static const struct ln *find(struct tbl *, const char *, size_t, int); +static const struct ln *find(struct mchars *, const char *, size_t, int); - void -chars_free(void *arg) +mchars_free(struct mchars *arg) { - struct tbl *tab; - tab = (struct tbl *)arg; - - free(tab->htab); - free(tab); + free(arg->htab); + free(arg); } - -void * -chars_init(enum chars type) +struct mchars * +mchars_alloc(void) { - struct tbl *tab; + struct mchars *tab; struct ln **htab; struct ln *pp; int i, hash; @@ -93,18 +86,9 @@ chars_init(enum chars type) * (they're in-line re-ordered during lookup). */ - tab = malloc(sizeof(struct tbl)); - if (NULL == tab) { - perror(NULL); - exit(EXIT_FAILURE); - } + tab = mandoc_malloc(sizeof(struct mchars)); + htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **)); - htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **)); - if (NULL == htab) { - perror(NULL); - exit(EXIT_FAILURE); - } - for (i = 0; i < LINES_MAX; i++) { hash = (int)lines[i].code[0] - PRINT_LO; @@ -119,7 +103,6 @@ chars_init(enum chars type) } tab->htab = htab; - tab->type = type; return(tab); } @@ -128,11 +111,11 @@ chars_init(enum chars type) * Special character to Unicode codepoint. */ int -chars_spec2cp(void *arg, const char *p, size_t sz) +mchars_spec2cp(struct mchars *arg, const char *p, size_t sz) { const struct ln *ln; - ln = find((struct tbl *)arg, p, sz, CHARS_CHAR); + ln = find(arg, p, sz, CHARS_CHAR); if (NULL == ln) return(-1); return(ln->unicode); @@ -143,60 +126,78 @@ chars_spec2cp(void *arg, const char *p, size_t sz) * Reserved word to Unicode codepoint. */ int -chars_res2cp(void *arg, const char *p, size_t sz) +mchars_res2cp(struct mchars *arg, const char *p, size_t sz) { const struct ln *ln; - ln = find((struct tbl *)arg, p, sz, CHARS_STRING); + ln = find(arg, p, sz, CHARS_STRING); if (NULL == ln) return(-1); return(ln->unicode); } +/* + * Numbered character to literal character. + * This can only be a printable character (i.e., alnum, punct, space) so + * prevent the character from ruining our state (backspace, newline, and + * so on). + * If the character is illegal, returns '\0'. + */ +char +mchars_num2char(const char *p, size_t sz) +{ + int i; + if (sz > 3) + return('\0'); + + i = atoi(p); + /* LINTED */ + return(isprint(i) ? i : '\0'); +} + /* * Special character to string array. */ const char * -chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz) +mchars_spec2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz) { const struct ln *ln; - ln = find((struct tbl *)arg, p, sz, CHARS_CHAR); + ln = find(arg, p, sz, CHARS_CHAR); if (NULL == ln) return(NULL); - *rsz = ln->asciisz; + *rsz = strlen(ln->ascii); return(ln->ascii); } - /* * Reserved word to string array. */ const char * -chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz) +mchars_res2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz) { const struct ln *ln; - ln = find((struct tbl *)arg, p, sz, CHARS_STRING); + ln = find(arg, p, sz, CHARS_STRING); if (NULL == ln) return(NULL); - *rsz = ln->asciisz; + *rsz = strlen(ln->ascii); return(ln->ascii); } - static const struct ln * -find(struct tbl *tab, const char *p, size_t sz, int type) +find(struct mchars *tab, const char *p, size_t sz, int type) { struct ln *pp, *prev; struct ln **htab; int hash; assert(p); - assert(sz > 0); + if (0 == sz) + return(NULL); if (p[0] < PRINT_LO || p[0] > PRINT_HI) return(NULL); @@ -231,14 +232,13 @@ find(struct tbl *tab, const char *p, size_t sz, int ty return(NULL); } - static inline int match(const struct ln *ln, const char *p, size_t sz, int type) { if ( ! (ln->type & type)) return(0); - if (ln->codesz != sz) + if (strncmp(ln->code, p, sz)) return(0); - return(0 == strncmp(ln->code, p, sz)); + return('\0' == ln->code[(int)sz]); }