[chip-tool] InitArguments is off by one for global commands

project-chip · Jan 6, 2023 · 1064c9b · 1064c9b
1 parent 7f668cd
commit 1064c9b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
@@ -47,9 +47,14 @@ bool Command::InitArguments(int argc, char ** argv)
     size_t argvExtraArgsCount = (size_t) argc;
     size_t mandatoryArgsCount = 0;
     size_t optionalArgsCount  = 0;
+    size_t startArgsPosition  = 0;
     for (auto & arg : mArgs)
     {
-        if (arg.isOptional())
+        if (arg.type == ArgumentType::AttributeOrEventName)
+        {
+            startArgsPosition = 1;
+        }
+        else if (arg.isOptional())
         {
             optionalArgsCount++;
         }
@@ -68,7 +73,7 @@ bool Command::InitArguments(int argc, char ** argv)
     for (size_t i = 0; i < mandatoryArgsCount; i++)
     {
         char * arg = argv[i];
-        if (!InitArgument(i, arg))
+        if (!InitArgument(startArgsPosition + i, arg))
         {
             ExitNow();
         }
@@ -79,7 +84,7 @@ bool Command::InitArguments(int argc, char ** argv)
     for (size_t i = mandatoryArgsCount; i < (size_t) argc; i += 2)
     {
         bool found = false;
-        for (size_t j = mandatoryArgsCount; j < mandatoryArgsCount + optionalArgsCount; j++)
+        for (size_t j = startArgsPosition + mandatoryArgsCount; j < startArgsPosition + mandatoryArgsCount + optionalArgsCount; j++)
         {
             // optional arguments starts with kOptionalArgumentPrefix
             if (strlen(argv[i]) <= kOptionalArgumentPrefixLength &&
@@ -331,7 +336,7 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
         return true;
     }
 
-    case ArgumentType::Attribute: {
+    case ArgumentType::AttributeOrEventName: {
         if (arg.isOptional() || arg.isNullable())
         {
             isValidArgument = false;
@@ -606,7 +611,7 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
 size_t Command::AddArgument(const char * name, const char * value, const char * desc, uint8_t flags)
 {
     Argument arg;
-    arg.type  = ArgumentType::Attribute;
+    arg.type  = ArgumentType::AttributeOrEventName;
     arg.name  = name;
     arg.value = const_cast<void *>(reinterpret_cast<const void *>(value));
     arg.flags = flags;
@@ -838,7 +843,7 @@ const char * Command::GetAttribute() const
     for (size_t i = 0; i < argsCount; i++)
     {
         Argument arg = mArgs.at(i);
-        if (arg.type == ArgumentType::Attribute)
+        if (arg.type == ArgumentType::AttributeOrEventName)
         {
             return reinterpret_cast<const char *>(arg.value);
         }
@@ -853,7 +858,7 @@ const char * Command::GetEvent() const
     for (size_t i = 0; i < argsCount; i++)
     {
         Argument arg = mArgs.at(i);
-        if (arg.type == ArgumentType::Attribute)
+        if (arg.type == ArgumentType::AttributeOrEventName)
         {
             return reinterpret_cast<const char *>(arg.value);
         }
@@ -943,8 +948,8 @@ void Command::ResetArguments()
                 VerifyOrDie(false);
                 break;
             }
-            case ArgumentType::Attribute: {
-                // No optional Attribute arguments so far.
+            case ArgumentType::AttributeOrEventName: {
+                // No optional AttributeOrEventName arguments so far.
                 VerifyOrDie(false);
                 break;
             }

diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
@@ -65,7 +65,7 @@ enum ArgumentType
     String,
     CharString,
     OctetString,
-    Attribute,
+    AttributeOrEventName,
     Address,
     Complex,
     Custom,

diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp
@@ -93,7 +93,8 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive)
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
-    if (!IsGlobalCommand(argv[2]))
+    bool isGlobalCommand = IsGlobalCommand(argv[2]);
+    if (!isGlobalCommand)
     {
         command = GetCommand(cluster->second, argv[2]);
         if (command == nullptr)
@@ -138,7 +139,8 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive)
         }
     }
 
-    if (!command->InitArguments(argc - 3, &argv[3]))
+    int argumentsPosition = isGlobalCommand ? 4 : 3;
+    if (!command->InitArguments(argc - argumentsPosition, &argv[argumentsPosition]))
     {
         ShowCommand(argv[0], argv[1], command);
         return CHIP_ERROR_INVALID_ARGUMENT;