Skip to content

Commit 9e22156

Browse files
committed
[NETSH] Pass correct dwCurrentIndex parameter to context and group commands
1 parent 3f4cee1 commit 9e22156

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

base/applications/network/netsh/interpreter.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ ProcessCommand(
5151
pCommand = pContext->pCommandListHead;
5252
while (pCommand != NULL)
5353
{
54-
if (_wcsicmp(argv[0], pCommand->pwszCmdToken) == 0)
54+
if (_wcsicmp(argv[dwCurrentIndex], pCommand->pwszCmdToken) == 0)
5555
{
56-
dwError = pCommand->pfnCmdHandler(NULL, argv, dwCurrentIndex, dwArgCount, 0, NULL, bDone);
56+
dwError = pCommand->pfnCmdHandler(NULL, argv, dwCurrentIndex + 1, dwArgCount, 0, NULL, bDone);
5757
if (dwError != ERROR_SUCCESS)
5858
{
59-
ConPrintf(StdOut, L"Error: %lu\n\n", dwError);
59+
ConPrintf(StdOut, L"Error: %lu\n\n", dwError);
6060
ConResPrintf(StdOut, pCommand->dwCmdHlpToken);
6161
}
6262
return TRUE;
@@ -68,7 +68,7 @@ ProcessCommand(
6868
pGroup = pContext->pGroupListHead;
6969
while (pGroup != NULL)
7070
{
71-
if (_wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0)
71+
if (_wcsicmp(argv[dwCurrentIndex], pGroup->pwszCmdGroupToken) == 0)
7272
{
7373
if (dwArgCount == 1)
7474
{
@@ -80,10 +80,9 @@ ProcessCommand(
8080
pCommand = pGroup->pCommandListHead;
8181
while (pCommand != NULL)
8282
{
83-
if ((dwArgCount > 1) && (_wcsicmp(argv[1], pCommand->pwszCmdToken) == 0))
84-
// if ((dwArgCount > dwCurrentIndex + 1) && (wcsicmp(argv[dwCurrentIndex + 1], pCommand->pwszCmdToken) == 0))
83+
if ((dwArgCount > 1) && (_wcsicmp(argv[dwCurrentIndex + 1], pCommand->pwszCmdToken) == 0))
8584
{
86-
dwError = pCommand->pfnCmdHandler(NULL, argv, dwCurrentIndex + 1, dwArgCount, 0, NULL, bDone);
85+
dwError = pCommand->pfnCmdHandler(NULL, argv, dwCurrentIndex + 2, dwArgCount, 0, NULL, bDone);
8786
if (dwError != ERROR_SUCCESS)
8887
{
8988
ConPrintf(StdOut, L"Error: %lu\n\n", dwError);

0 commit comments

Comments
 (0)