From 39b89889e73baab618860d9f5a56e684c096850f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=83=C2=A9lien=20Nephtali?=
 <aurelien.nephtali@gmail.com>
Date: Sat, 17 Feb 2018 20:53:11 +0100
Subject: [PATCH] BUG/MINOR: init: Add missing brackets in the code parsing
 -sf/-st
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The codes tries to strip trailing spaces of arguments but due to missing
brackets, it will always exit.

It can be reproduced with this (silly) example:

$ haproxy -f /etc/haproxy/haproxy.cfg -sf 1234 "1235 " 1236
$ echo $?
1

This was introduced in commit 236062f7c ("MINOR: init: emit warning when
-sf/-sd cannot parse argument")

Signed-off-by: Aurélien Nephtali <aurelien.nephtali@gmail.com>
---
 src/haproxy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/haproxy.c b/src/haproxy.c
index 98b18dafa..8785b9f94 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1461,10 +1461,11 @@ static void init(int argc, char **argv)
 						exit(1);
 					} else if (endptr && strlen(endptr)) {
 						while (isspace(*endptr)) endptr++;
-						if (*endptr != 0)
+						if (*endptr != 0) {
 							ha_alert("-%2s option: some bytes unconsumed in PID list {%s}\n",
 								 flag, endptr);
 							exit(1);
+						}
 					}
 					if (oldpids[nb_oldpids] <= 0)
 						usage(progname);