===================================================================
RCS file: /cvs/mandoc/chars.c,v
retrieving revision 1.32
retrieving revision 1.42
diff -u -p -r1.32 -r1.42
--- mandoc/chars.c	2011/01/30 16:05:37	1.32
+++ mandoc/chars.c	2011/05/15 15:47:46	1.42
@@ -1,4 +1,4 @@
-/*	$Id: chars.c,v 1.32 2011/01/30 16:05:37 schwarze Exp $ */
+/*	$Id: chars.c,v 1.42 2011/05/15 15:47:46 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,12 +20,12 @@
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
-#include "chars.h"
 
 #define	PRINT_HI	 126
 #define	PRINT_LO	 32
@@ -41,7 +41,7 @@ struct	ln {
 #define CHARS_BOTH	 (CHARS_CHAR | CHARS_STRING)
 };
 
-#define	LINES_MAX	  351
+#define	LINES_MAX	  353
 
 #define CHAR(in, ch, code) \
 	{ NULL, (in), (ch), (code), CHARS_CHAR },
@@ -55,32 +55,26 @@ struct	ln {
 
 #include "chars.in"
 
-struct	ctab {
-	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 ctab *, 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 ctab	*tab;
 
-	tab = (struct ctab *)arg;
-
-	free(tab->htab);
-	free(tab);
+	free(arg->htab);
+	free(arg);
 }
 
-
-void *
-chars_init(enum chars type)
+struct mchars *
+mchars_alloc(void)
 {
-	struct ctab	 *tab;
+	struct mchars	 *tab;
 	struct ln	**htab;
 	struct ln	 *pp;
 	int		  i, hash;
@@ -92,18 +86,9 @@ chars_init(enum chars type)
 	 * (they're in-line re-ordered during lookup).
 	 */
 
-	tab = malloc(sizeof(struct ctab));
-	if (NULL == tab) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
+	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((int)MANDOCLEVEL_SYSERR);
-	}
-
 	for (i = 0; i < LINES_MAX; i++) {
 		hash = (int)lines[i].code[0] - PRINT_LO;
 
@@ -118,7 +103,6 @@ chars_init(enum chars type)
 	}
 
 	tab->htab = htab;
-	tab->type = type;
 	return(tab);
 }
 
@@ -127,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 ctab *)arg, p, sz, CHARS_CHAR);
+	ln = find(arg, p, sz, CHARS_CHAR);
 	if (NULL == ln)
 		return(-1);
 	return(ln->unicode);
@@ -142,47 +126,45 @@ 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 ctab *)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,
- * represented as a null-terminated string for additional safety.
+ * 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'.
  */
-const char *
-chars_num2char(const char *p, size_t sz)
+char
+mchars_num2char(const char *p, size_t sz)
 {
 	int		  i;
-	static char	  c[2];
 
 	if (sz > 3)
-		return(NULL);
+		return('\0');
+
 	i = atoi(p);
-	if (i < 0 || i > 255)
-		return(NULL);
-	c[0] = (char)i;
-	c[1] = '\0';
-	return(c);
+	/* 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 ctab *)arg, p, sz, CHARS_CHAR);
+	ln = find(arg, p, sz, CHARS_CHAR);
 	if (NULL == ln)
 		return(NULL);
 
@@ -190,16 +172,15 @@ chars_spec2str(void *arg, const char *p, size_t sz, si
 	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 ctab *)arg, p, sz, CHARS_STRING);
+	ln = find(arg, p, sz, CHARS_STRING);
 	if (NULL == ln)
 		return(NULL);
 
@@ -207,9 +188,8 @@ chars_res2str(void *arg, const char *p, size_t sz, siz
 	return(ln->ascii);
 }
 
-
 static const struct ln *
-find(struct ctab *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;
@@ -251,7 +231,6 @@ find(struct ctab *tab, const char *p, size_t sz, int t
 
 	return(NULL);
 }
-
 
 static inline int
 match(const struct ln *ln, const char *p, size_t sz, int type)