From 80af7bc382685a69865e5f3cf600e8f8efb39dd1 Mon Sep 17 00:00:00 2001
From: tjr <tjr@FreeBSD.org>
Date: Wed, 19 Jun 2002 09:24:30 +0000
Subject: Let printf(1) tell the difference between zero width/precision and
 unspecified width/precision.

PR:		39116
Submitted by:	Egil Brendsdal <egilb@ife.no>
MFC after:	1 week
---
 usr.bin/printf/printf.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index ad38200..2887921 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -73,12 +73,12 @@ static const char rcsid[] =
 
 #define PF(f, func) do { \
 	char *b = NULL; \
-	if (fieldwidth) \
-		if (precision) \
+	if (havewidth) \
+		if (haveprec) \
 			(void)asprintf(&b, f, fieldwidth, precision, func); \
 		else \
 			(void)asprintf(&b, f, fieldwidth, func); \
-	else if (precision) \
+	else if (haveprec) \
 		(void)asprintf(&b, f, precision, func); \
 	else \
 		(void)asprintf(&b, f, func); \
@@ -111,7 +111,7 @@ main(argc, argv)
 	char *argv[];
 {
 	static const char *skip1, *skip2;
-	int ch, chopped, end, fieldwidth, precision, rval;
+	int ch, chopped, end, fieldwidth, haveprec, havewidth, precision, rval;
 	char convch, nextch, *format, *fmt, *start;
 
 #ifndef BUILTIN
@@ -184,9 +184,10 @@ next:		for (start = fmt;; ++fmt) {
 		if (*fmt == '*') {
 			if (getint(&fieldwidth))
 				return (1);
+			havewidth = 1;
 			++fmt;
 		} else {
-			fieldwidth = 0;
+			havewidth = 0;
 
 			/* skip to possible '.', get following precision */
 			for (; strchr(skip2, *fmt); ++fmt);
@@ -197,15 +198,16 @@ next:		for (start = fmt;; ++fmt) {
 			if (*fmt == '*') {
 				if (getint(&precision))
 					return (1);
+				haveprec = 1;
 				++fmt;
 			} else {
-				precision = 0;
+				haveprec = 0;
 
 				/* skip to conversion char */
 				for (; strchr(skip2, *fmt); ++fmt);
 			}
 		} else
-			precision = 0;
+			haveprec = 0;
 		if (!*fmt) {
 			warnx1("missing format character", NULL, NULL);
 			return (1);
-- 
cgit v1.1