From f27f579358d2c12fc3926bfd5bb95ef3e08ca6a7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 2 Apr 2019 15:09:44 +0200 Subject: 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. --- cli/options.cli | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cli/options.cli') 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 { "", - "Read additional options from 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 . 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 -- cgit v1.1