===================================================================
RCS file: /cvs/mandoc/chars.c,v
retrieving revision 1.59
retrieving revision 1.67
diff -u -p -r1.59 -r1.67
--- mandoc/chars.c	2014/08/10 23:54:41	1.59
+++ mandoc/chars.c	2015/10/06 18:32:19	1.67
@@ -1,7 +1,7 @@
-/*	$Id: chars.c,v 1.59 2014/08/10 23:54:41 schwarze Exp $ */
+/*	$Id: chars.c,v 1.67 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014 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
@@ -38,7 +38,7 @@ struct	ln {
 	int		  unicode;
 };
 
-#define	LINES_MAX	  330
+#define	LINES_MAX	  332
 
 #define CHAR(in, ch, code) \
 	{ NULL, (in), (ch), (code) },
@@ -95,7 +95,7 @@ mchars_alloc(void)
 	}
 
 	tab->htab = htab;
-	return(tab);
+	return tab;
 }
 
 int
@@ -104,20 +104,16 @@ mchars_spec2cp(const struct mchars *arg, const char *p
 	const struct ln	*ln;
 
 	ln = find(arg, p, sz);
-	if (NULL == ln)
-		return(-1);
-	return(ln->unicode);
+	return ln != NULL ? ln->unicode : sz == 1 ? (unsigned char)*p : -1;
 }
 
-char
+int
 mchars_num2char(const char *p, size_t sz)
 {
 	int	  i;
 
-	if ((i = mandoc_strntoi(p, sz, 10)) < 0)
-		return('\0');
-
-	return(i > 0 && i < 256 && isprint(i) ? i : '\0');
+	i = mandoc_strntoi(p, sz, 10);
+	return i >= 0 && i < 256 ? i : -1;
 }
 
 int
@@ -125,21 +121,9 @@ mchars_num2uc(const char *p, size_t sz)
 {
 	int	 i;
 
-	if ((i = mandoc_strntoi(p, sz, 16)) < 0)
-		return('\0');
-
-	/*
-	 * 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.
-	 */
-
-	return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+	i = mandoc_strntoi(p, sz, 16);
+	assert(i >= 0 && i <= 0x10FFFF);
+	return i;
 }
 
 const char *
@@ -149,15 +133,26 @@ mchars_spec2str(const struct mchars *arg,
 	const struct ln	*ln;
 
 	ln = find(arg, p, sz);
-	if (NULL == ln) {
+	if (ln == NULL) {
 		*rsz = 1;
-		return(NULL);
+		return sz == 1 ? p : NULL;
 	}
 
 	*rsz = strlen(ln->ascii);
-	return(ln->ascii);
+	return ln->ascii;
 }
 
+const char *
+mchars_uc2str(int uc)
+{
+	int	 i;
+
+	for (i = 0; i < LINES_MAX; i++)
+		if (uc == lines[i].unicode)
+			return lines[i].ascii;
+	return "<?>";
+}
+
 static const struct ln *
 find(const struct mchars *tab, const char *p, size_t sz)
 {
@@ -167,14 +162,14 @@ find(const struct mchars *tab, const char *p, size_t s
 	assert(p);
 
 	if (0 == sz || p[0] < PRINT_LO || p[0] > PRINT_HI)
-		return(NULL);
+		return NULL;
 
 	hash = (int)p[0] - PRINT_LO;
 
 	for (pp = tab->htab[hash]; pp; pp = pp->next)
 		if (0 == strncmp(pp->code, p, sz) &&
 		    '\0' == pp->code[(int)sz])
-			return(pp);
+			return pp;
 
-	return(NULL);
+	return NULL;
 }