Merge refactoring short options (#18741)

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;
@@ -160,7 +171,17 @@ void TClientCommand::CheckForExecutableOptions(TConfig& config) {
         if (optName.StartsWith("--")) {
             opt = config.Opts->FindLongOption(optName.substr(2));
         } else {
-            opt = config.Opts->FindCharOption(optName[1]);
+            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;