-/* $Id: chars.c,v 1.1 2009/09/17 07:41:28 kristaps Exp $ */
+/* $Id: chars.c,v 1.58 2014/07/23 15:00:08 schwarze Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <assert.h>
-#include <err.h>
+#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#include "chars.h"
+#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "libmandoc.h"
-#define ASCII_PRINT_HI 126
-#define ASCII_PRINT_LO 32
+#define PRINT_HI 126
+#define PRINT_LO 32
struct ln {
struct ln *next;
const char *code;
- const char *out;
- size_t codesz;
- size_t outsz;
- int type;
-#define CHARS_CHAR (1 << 0)
-#define CHARS_STRING (1 << 1)
-#define CHARS_BOTH (0x03)
+ const char *ascii;
+ int unicode;
};
-#define LINES_MAX 266
+#define LINES_MAX 330
+
+#define CHAR(in, ch, code) \
+ { NULL, (in), (ch), (code) },
-#define CHAR(w, x, y, z) \
- { NULL, (w), (y), (x), (z), CHARS_CHAR },
-#define STRING(w, x, y, z) \
- { NULL, (w), (y), (x), (z), CHARS_STRING },
-#define BOTH(w, x, y, z) \
- { NULL, (w), (y), (x), (z), CHARS_BOTH },
+#define CHAR_TBL_START static struct ln lines[LINES_MAX] = {
+#define CHAR_TBL_END };
-static struct ln lines[LINES_MAX] = {
#include "chars.in"
-};
-struct tbl {
+struct mchars {
struct ln **htab;
};
-static inline int match(const struct ln *,
- const char *, size_t, int);
-static const char *find(struct tbl *, const char *,
- size_t, size_t *, int);
+static const struct ln *find(const struct mchars *,
+ const char *, size_t);
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);
}
-
-/* ARGSUSED */
-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;
/*
* Constructs a very basic chaining hashtable. The hash routine
* is simply the integral value of the first character.
- * Subsequent entries are chained in the order they're processed
- * (they're in-line re-ordered during lookup).
+ * Subsequent entries are chained in the order they're processed.
*/
- if (NULL == (tab = malloc(sizeof(struct tbl))))
- err(1, "malloc");
-
- htab = calloc(ASCII_PRINT_HI - ASCII_PRINT_LO + 1,
- sizeof(struct ln **));
-
- if (NULL == htab)
- err(1, "malloc");
+ tab = mandoc_malloc(sizeof(struct mchars));
+ htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln *));
for (i = 0; i < LINES_MAX; i++) {
- assert(lines[i].codesz > 0);
- assert(lines[i].code);
- assert(lines[i].out);
-
- hash = (int)lines[i].code[0] - ASCII_PRINT_LO;
+ hash = (int)lines[i].code[0] - PRINT_LO;
if (NULL == (pp = htab[hash])) {
htab[hash] = &lines[i];
for ( ; pp->next; pp = pp->next)
/* Scan ahead. */ ;
-
pp->next = &lines[i];
}
return(tab);
}
-
-const char *
-chars_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz)
+int
+mchars_spec2cp(const struct mchars *arg, const char *p, size_t sz)
{
+ const struct ln *ln;
- return(find((struct tbl *)arg, p, sz, rsz, CHARS_CHAR));
+ ln = find(arg, p, sz);
+ if (NULL == ln)
+ return(-1);
+ return(ln->unicode);
}
-
-const char *
-chars_a2res(void *arg, const char *p, size_t sz, size_t *rsz)
+char
+mchars_num2char(const char *p, size_t sz)
{
+ int i;
- return(find((struct tbl *)arg, p, sz, rsz, CHARS_STRING));
-}
+ if ((i = mandoc_strntoi(p, sz, 10)) < 0)
+ return('\0');
+ return(i > 0 && i < 256 && isprint(i) ? i : '\0');
+}
-static const char *
-find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
+int
+mchars_num2uc(const char *p, size_t sz)
{
- struct ln *pp, *prev;
- struct ln **htab;
- int hash;
+ int i;
- assert(p);
- assert(sz > 0);
-
- if (p[0] < ASCII_PRINT_LO || p[0] > ASCII_PRINT_HI)
- return(NULL);
+ if ((i = mandoc_strntoi(p, sz, 16)) < 0)
+ return('\0');
/*
- * Lookup the symbol in the symbol hash. See ascii2htab for the
- * hashtable specs. This dynamically re-orders the hash chain
- * to optimise for repeat hits.
+ * Security warning:
+ * Never extend the range of accepted characters
+ * to overlap with the ASCII range, 0x00-0x7F
+ * without re-auditing the callers of this function.
+ * Some callers might relay on the fact that we never
+ * return ASCII characters for their escaping decisions.
+ *
+ * XXX Code is missing here to exclude bogus ranges.
*/
- hash = (int)p[0] - ASCII_PRINT_LO;
- htab = tab->htab;
+ return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+}
- if (NULL == (pp = htab[hash]))
- return(NULL);
+const char *
+mchars_spec2str(const struct mchars *arg,
+ const char *p, size_t sz, size_t *rsz)
+{
+ const struct ln *ln;
- if (NULL == pp->next) {
- if ( ! match(pp, p, sz, type))
- return(NULL);
- *rsz = pp->outsz;
- return(pp->out);
+ ln = find(arg, p, sz);
+ if (NULL == ln) {
+ *rsz = 1;
+ return(NULL);
}
- for (prev = NULL; pp; pp = pp->next) {
- if ( ! match(pp, p, sz, type)) {
- prev = pp;
- continue;
- }
-
- /* Re-order the hash chain. */
+ *rsz = strlen(ln->ascii);
+ return(ln->ascii);
+}
- if (prev) {
- prev->next = pp->next;
- pp->next = htab[hash];
- htab[hash] = pp;
- }
+static const struct ln *
+find(const struct mchars *tab, const char *p, size_t sz)
+{
+ const struct ln *pp;
+ int hash;
- *rsz = pp->outsz;
- return(pp->out);
- }
+ assert(p);
- return(NULL);
-}
+ if (0 == sz || p[0] < PRINT_LO || p[0] > PRINT_HI)
+ return(NULL);
+ hash = (int)p[0] - PRINT_LO;
-static inline int
-match(const struct ln *ln, const char *p, size_t sz, int type)
-{
+ for (pp = tab->htab[hash]; pp; pp = pp->next)
+ if (0 == strncmp(pp->code, p, sz) &&
+ '\0' == pp->code[(int)sz])
+ return(pp);
- if ( ! (ln->type & type))
- return(0);
- if (ln->codesz != sz)
- return(0);
- return(0 == strncmp(ln->code, p, sz));
+ return(NULL);
}
git.ckatri.com / mandoc.git / blobdiff