From f75b3f5d519e0b14452d5e9db9f2808c671dddb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Tue, 19 Feb 2013 18:05:20 -0500
Subject: [PATCH] libwinpr-utils: fix parsing of optional arguments with the
 space separator

---
 winpr/libwinpr/utils/cmdline.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/winpr/libwinpr/utils/cmdline.c b/winpr/libwinpr/utils/cmdline.c
index 431f34a4a..7ba1822c5 100644
--- a/winpr/libwinpr/utils/cmdline.c
+++ b/winpr/libwinpr/utils/cmdline.c
@@ -209,8 +209,27 @@ int CommandLineParseArgumentsA(int argc, LPCSTR* argv, COMMAND_LINE_ARGUMENT_A*
 
 				if ((flags & COMMAND_LINE_SEPARATOR_SPACE) && ((i + 1) < argc))
 				{
-					if ((options[j].Flags & COMMAND_LINE_VALUE_REQUIRED) ||
-						(options[j].Flags & COMMAND_LINE_VALUE_OPTIONAL))
+					int value_present = 1;
+
+					if (flags & COMMAND_LINE_SIGIL_DASH)
+					{
+						if (strncmp(argv[i + 1], "-", 1) == 0)
+							value_present = 0;
+					}
+
+					if (flags & COMMAND_LINE_SIGIL_DOUBLE_DASH)
+					{
+						if (strncmp(argv[i + 1], "--", 2) == 0)
+							value_present = 0;
+					}
+
+					if (flags & COMMAND_LINE_SIGIL_SLASH)
+					{
+						if (strncmp(argv[i + 1], "/", 1) == 0)
+							value_present = 0;
+					}
+
+					if (value_present)
 					{
 						i++;
 						value_index = 0;