Refactor short option handling (#15614)

Author: pnv1

ydb/public/lib/ydb_cli/common/command.cpp

@@ -133,13 +133,24 @@ TClientCommand::TOptsParseOneLevelResult::TOptsParseOneLevelResult(TConfig& conf
             optName = optName.substr(0, eqPos);
             if (optName.StartsWith("--")) {
                 opt = config.Opts->FindLongOption(optName.substr(2));
-            } else {
-                opt = config.Opts->FindCharOption(optName[1]);
-            }
-            if (opt != nullptr && opt->GetHasArg() != NLastGetopt::NO_ARGUMENT) {
-                if (eqPos == TStringBuf::npos) {
+                if (opt != nullptr && opt->GetHasArg() != NLastGetopt::NO_ARGUMENT && eqPos == TStringBuf::npos) {
                     ++_argc;
                 }
+            } else {
+                if (optName.length() > 2) {
+                    // Char option list
+                    if (eqPos != TStringBuf::npos) {
+                        throw yexception() << "Char option list " << optName << " can not be followed by \"=\" sign";
+                    }
+                } else if (optName.length() == 2) {
+                    // Single char option
+                    opt = config.Opts->FindCharOption(optName[1]);
+                    if (opt != nullptr && opt->GetHasArg() != NLastGetopt::NO_ARGUMENT && eqPos == TStringBuf::npos) {
+                        ++_argc;
+                    }
+                } else {
+                    throw yexception() << "Wrong CLI argument \"" << optName << "\"";
+                }
             }
         } else {
             --levels;
@@ -149,31 +160,6 @@ TClientCommand::TOptsParseOneLevelResult::TOptsParseOneLevelResult(TConfig& conf
     Init(config.Opts, _argc, const_cast<const char**>(config.ArgV));
 }
 
-void TClientCommand::CheckForExecutableOptions(TConfig& config) {
-    int argc = 1;
-
-    while (argc < config.ArgC && config.ArgV[argc][0] == '-') {
-        const NLastGetopt::TOpt* opt = nullptr;
-        TStringBuf optName(config.ArgV[argc]);
-        auto eqPos = optName.find('=');
-        optName = optName.substr(0, eqPos);
-        if (optName.StartsWith("--")) {
-            opt = config.Opts->FindLongOption(optName.substr(2));
-        } else {
-            opt = config.Opts->FindCharOption(optName[1]);
-        }
-        if (config.ExecutableOptions.find(optName) != config.ExecutableOptions.end()) {
-            config.HasExecutableOptions = true;
-        }
-        if (opt != nullptr && opt->GetHasArg() != NLastGetopt::NO_ARGUMENT) {
-            if (eqPos == TStringBuf::npos) {
-                ++argc;
-            }
-        }
-        ++argc;
-    }
-}
-
 void TClientCommand::Config(TConfig& config) {
     config.Opts = &Opts;
     config.OnlyExplicitProfile = OnlyExplicitProfile;
@@ -212,7 +198,6 @@ void TClientCommand::Prepare(TConfig& config) {
     config.ArgsSettings = TConfig::TArgSettings();
     config.Opts = &Opts;
     Config(config);
-    CheckForExecutableOptions(config);
     config.CheckParamsCount();
     SetCustomUsage(config);
     SaveParseResult(config);

ydb/public/lib/ydb_cli/common/command.h

@@ -102,8 +102,6 @@ class TClientCommand {
         TVector<TString> Tokens;
         TString SecurityToken;
         TList<TCommandInfo> ParentCommands;
-        THashSet<TString> ExecutableOptions;
-        bool HasExecutableOptions = false;
         TString Path;
         TArgSettings ArgsSettings;
         TString Address;
@@ -225,7 +223,7 @@ class TClientCommand {
 
         void CheckParamsCount() {
             size_t count = GetParamsCount();
-            if (HasHelpCommand() || HasExecutableOptions) {
+            if (HasHelpCommand()) {
                 return;
             }
             bool minSet = ArgsSettings.Min.GetIsSet();
@@ -407,7 +405,6 @@ class TClientCommand {
 private:
     void HideOption(const TString& name);
     void ChangeOptionDescription(const TString& name, const TString& description);
-    void CheckForExecutableOptions(TConfig& config);
 
     constexpr static int DESCRIPTION_ALIGNMENT = 28;
 };