Revert removing executable options (#15676)

Author: pnv1

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

@@ -159,6 +159,41 @@ 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 {
+            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]);
+            } else {
+                throw yexception() << "Wrong CLI argument \"" << optName << "\"";
+            }
+        }
+        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;
@@ -197,6 +232,7 @@ 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,6 +102,8 @@ class TClientCommand {
         TVector<TString> Tokens;
         TString SecurityToken;
         TList<TCommandInfo> ParentCommands;
+        THashSet<TString> ExecutableOptions;
+        bool HasExecutableOptions = false;
         TString Path;
         TArgSettings ArgsSettings;
         TString Address;
@@ -221,7 +223,7 @@ class TClientCommand {
 
         void CheckParamsCount() {
             size_t count = GetParamsCount();
-            if (HasHelpCommand()) {
+            if (HasHelpCommand() || HasExecutableOptions) {
                 return;
             }
             bool minSet = ArgsSettings.Min.GetIsSet();
@@ -380,6 +382,7 @@ 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;
 };