lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix install/inc: detect unknown options

Browse Source 
Previous commit 3c883c4b31 added support
for parsing option -- in particular -c/--config -- and added some way of
detecting invalid arguments. But the detection was incorrect.

getopt will stop looking for arguments when it detects a non-argument
(dash-prefixed) which is not an option parameter, but checking that
options were all consumed should be done right after by comparing the
options up to this last non-argument and those that were detected.

This only displays the first unrecognized option, mimicking the
behaviour of most software.
This commit is contained in:
Alexandre Janniaux 2023-04-27 14:09:55 +02:00
parent f19a36856b
commit 9b2ffafd93
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/install/inc.php
View File

@ -146,12 +146,26 @@ if (php_sapi_name() === "cli") {
exit(0); exit(0);
} }
// Parse the arguments to find the options.
$args_options = array_filter(array_slice($argv, 0, $rest_index), function ($arg) {
return strlen($arg) >= 2 && $arg[0] == '-';
});
$parsed_options = array_map(function ($arg) {
if (strlen($arg) > 1)
return "--" . $arg;
return "-" . $arg;
}, array_keys($opts));
// Find options (dash-prefixed) that were not parsed.
$unknown_options = array_diff($args_options, $parsed_options);
// In the following test, only dash-prefixed arguments will trigger an // In the following test, only dash-prefixed arguments will trigger an
// error, given that scripts options can allow a variable number of // error, given that scripts options can allow a variable number of
// additional non-prefixed argument and we mostly want to check for // additional non-prefixed argument and we mostly want to check for
// typo right now. // typo right now.
if ($rest_index < $argc && $argv[$rest_index][0] == "-") { if (count($unknown_options) > 0) {
usage($argv[0], "Unknown option ".$argv[$rest_index]. ", usage:"); echo "Unknown option: ".array_values($unknown_options)[0]."\n";
usage($argv[0], "Usage:");
exit(1); exit(1);
} }