===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.54
retrieving revision 1.56
diff -u -p -r1.54 -r1.56
--- mandoc/out.c	2014/12/04 02:05:42	1.54
+++ mandoc/out.c	2014/12/23 09:31:46	1.56
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.54 2014/12/04 02:05:42 schwarze Exp $ */
+/*	$Id: out.c,v 1.56 2014/12/23 09:31:46 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,8 +20,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -39,97 +37,67 @@ static	void	tblcalc_number(struct rofftbl *, struct ro
 
 
 /*
- * Convert a `scaling unit' to a consistent form, or fail.  Scaling
- * units are documented in groff.7, mdoc.7, man.7.
+ * Parse the *src string and store a scaling unit into *dst.
+ * If the string doesn't specify the unit, use the default.
+ * If no default is specified, fail.
+ * Return 2 on complete success, 1 when a conversion was done,
+ * but there was trailing garbage, and 0 on total failure.
  */
 int
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
-	char		 buf[BUFSIZ], hasd;
-	int		 i;
-	enum roffscale	 unit;
+	char		*endptr;
 
-	if ('\0' == *src)
+	dst->unit = def == SCALE_MAX ? SCALE_BU : def;
+	dst->scale = strtod(src, &endptr);
+	if (endptr == src)
 		return(0);
 
-	i = hasd = 0;
-
-	switch (*src) {
-	case '+':
-		src++;
+	switch (*endptr++) {
+	case 'c':
+		dst->unit = SCALE_CM;
 		break;
-	case '-':
-		buf[i++] = *src++;
+	case 'i':
+		dst->unit = SCALE_IN;
 		break;
-	default:
+	case 'f':
+		dst->unit = SCALE_FS;
 		break;
-	}
-
-	if ('\0' == *src)
-		return(0);
-
-	while (i < BUFSIZ) {
-		if ( ! isdigit((unsigned char)*src)) {
-			if ('.' != *src)
-				break;
-			else if (hasd)
-				break;
-			else
-				hasd = 1;
-		}
-		buf[i++] = *src++;
-	}
-
-	if (BUFSIZ == i || (*src && *(src + 1)))
-		return(0);
-
-	buf[i] = '\0';
-
-	switch (*src) {
-	case 'c':
-		unit = SCALE_CM;
+	case 'M':
+		dst->unit = SCALE_MM;
 		break;
-	case 'i':
-		unit = SCALE_IN;
+	case 'm':
+		dst->unit = SCALE_EM;
 		break;
+	case 'n':
+		dst->unit = SCALE_EN;
+		break;
 	case 'P':
-		unit = SCALE_PC;
+		dst->unit = SCALE_PC;
 		break;
 	case 'p':
-		unit = SCALE_PT;
+		dst->unit = SCALE_PT;
 		break;
-	case 'f':
-		unit = SCALE_FS;
+	case 'u':
+		dst->unit = SCALE_BU;
 		break;
 	case 'v':
-		unit = SCALE_VS;
+		dst->unit = SCALE_VS;
 		break;
-	case 'm':
-		unit = SCALE_EM;
-		break;
 	case '\0':
+		endptr--;
+		/* FALLTHROUGH */
+	default:
 		if (SCALE_MAX == def)
 			return(0);
-		unit = def;
+		dst->unit = def;
 		break;
-	case 'u':
-		unit = SCALE_BU;
-		break;
-	case 'M':
-		unit = SCALE_MM;
-		break;
-	case 'n':
-		unit = SCALE_EN;
-		break;
-	default:
-		return(0);
 	}
 
 	/* FIXME: do this in the caller. */
-	if ((dst->scale = atof(buf)) < 0.0)
+	if (dst->scale < 0.0)
 		dst->scale = 0.0;
-	dst->unit = unit;
-	return(1);
+	return(*endptr == '\0' ? 2 : 1);
 }
 
 /*