From 7cc9344fb32fdf6b1116235fe6fe8afbc91cdb19 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Tue, 8 Aug 2017 02:12:21 +0800
Subject: Support printing flags in any order.

---
 source/fitz/printf.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'source/fitz/printf.c')

diff --git a/source/fitz/printf.c b/source/fitz/printf.c
index 55a7dfe1..3b0072f7 100644
--- a/source/fitz/printf.c
+++ b/source/fitz/printf.c
@@ -196,29 +196,29 @@ fz_format_string(fz_context *ctx, void *user, void (*emit)(fz_context *ctx, void
 	{
 		if (c == '%')
 		{
-			c = *fmt++;
-			if (c == 0)
-				break;
-
-			/* sign */
 			s = 0;
-			if (c == '+') {
-				s = 1;
-				c = *fmt++;
-				if (c == 0)
-					break;
-			}
-
-			/* TODO: '-' to left justify */
-
-			/* leading zero */
-			z = ' ';
-			if (c == '0') {
-				z = '0';
-				c = *fmt++;
-				if (c == 0)
+			z = 0;
+
+			/* flags */
+			while ((c = *fmt++) != 0)
+			{
+				/* sign */
+				if (c == '+')
+					s = 1;
+				/* space padding */
+				else if (c == ' ')
+					z = ' ';
+				/* leading zero */
+				else if (c == '0')
+					z = z != ' ' ? '0' : z;
+				/* TODO: '-' to left justify */
+				else
 					break;
 			}
+			if (!z)
+				z = ' ';
+			if (c == 0)
+				break;
 
 			/* width */
 			w = 0;
-- 
cgit v1.2.3