Handle combined option values in argv_file_scanner

Turns out we cannot just pass them along as combined because of quoting.

While at it, also add support for quoting non-option arguments.

1 files changed, 9 insertions, 9 deletions

diff --git a/cli/options.cli b/cli/options.cli
index 8781bc6..9af36cd 100644
--- a/cli/options.cli
+++ b/cli/options.cli
@@ -633,15 +633,15 @@ class options
   std::string --options-file
   {
     "<file>",
-    "Read additional options from <file> with each option appearing on a
-     separate line optionally followed by space and an option value. Empty
-     lines and lines starting with \cb{#} are ignored. Option values can
-     be enclosed in double (\cb{\"}) or single (\cb{'}) quotes  to preserve
-     leading and trailing whitespaces as well as to specify empty values.
-     If the value itself contains trailing or leading quotes, enclose it
-     with an extra pair of quotes, for example \cb{'\"x\"'}. Non-leading
-     and non-trailing quotes are interpreted as being part of the option
-     value.
+    "Read additional options from <file>. Each option should appear on a
+     separate line optionally followed by space or equal sign (\cb{=}) and an
+     option value. Empty lines and lines starting with \cb{#} are ignored.
+     Option values can be enclosed in double (\cb{\"}) or single (\cb{'})
+     quotes to preserve leading and trailing whitespaces as well as to specify
+     empty values.  If the value itself contains trailing or leading quotes,
+     enclose it with an extra pair of quotes, for example \cb{'\"x\"'}.
+     Non-leading and non-trailing quotes are interpreted as being part of the
+     option value.
 
      The semantics of providing options in a file is equivalent to providing
      the same set of options in the same order on the command line at the