===================================================================
RCS file: /cvs/mandoc/chars.c,v
retrieving revision 1.57
retrieving revision 1.60
diff -u -p -r1.57 -r1.60
--- mandoc/chars.c	2014/04/20 16:46:04	1.57
+++ mandoc/chars.c	2014/10/26 17:12:03	1.60
@@ -1,7 +1,7 @@
-/*	$Id: chars.c,v 1.57 2014/04/20 16:46:04 schwarze Exp $ */
+/*	$Id: chars.c,v 1.60 2014/10/26 17:12:03 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
@@ -15,10 +15,10 @@
  * 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 <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -104,9 +104,7 @@ 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 ? *p : -1);
 }
 
 char
@@ -126,9 +124,13 @@ mchars_num2uc(const char *p, size_t sz)
 	int	 i;
 
 	if ((i = mandoc_strntoi(p, sz, 16)) < 0)
-		return('\0');
-	/* FIXME: make sure we're not in a bogus range. */
-	return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+		return(0xFFFD);
+
+	/*
+	 * XXX Code is missing here to exclude bogus ranges.
+	 */
+
+	return(i <= 0x10FFFF ? i : 0xFFFD);
 }
 
 const char *
@@ -138,9 +140,9 @@ 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);