[NETSH] Replace the command line interpreter

- Replace the recursive command line interpreter by a state machine.
- Simplify the help functions.

This enables us to run 'interface ip' or 'interface ip show config' in a single command.

Author: EricKohl

base/applications/network/netsh/help.c

@@ -96,19 +96,6 @@ PrintShortGroupCommands(
 }
 
 
-static
-VOID
-PrintLongCommand(
-    _In_ PCONTEXT_ENTRY pContext,
-    _In_ PCOMMAND_ENTRY pCommand)
-{
-    WCHAR szBuffer[80];
-
-    LoadStringW(pContext->hModule, pCommand->dwCmdHlpToken, szBuffer, 80);
-    ConPrintf(StdOut, szBuffer);
-}
-
-
 static
 int
 HelpCompare(
@@ -227,159 +214,70 @@ PrintContext(
         HeapFree(GetProcessHeap(), 0, pHelpArray);
 }
 
-
 static
 VOID
-PrintGroup(
-    _In_ PCONTEXT_ENTRY pContext,
-    _In_ LPWSTR pszGroupName,
-    _In_ BOOL bRecurse)
+PrintSubcontexts(
+    _In_ PCONTEXT_ENTRY pContext)
 {
-    PCOMMAND_GROUP pGroup;
+    if (pContext->pSubContextHead == NULL)
+        return;
 
-    if (bRecurse)
+    ConResPrintf(StdOut, IDS_SUBCONTEXT_HEADER);
+    pContext = pContext->pSubContextHead;
+    while (pContext != NULL)
     {
-        if (pContext != pRootContext)
-            PrintGroup(pContext->pParentContext, pszGroupName, bRecurse);
-    }
-
-    pGroup = pContext->pGroupListHead;
-    while (pGroup != NULL)
-    {
-        if (_wcsicmp(pszGroupName, pGroup->pwszCmdGroupToken) == 0)
-        {
-            PrintCurrentContextHeader(pContext);
-            PrintShortGroupCommands(pContext, pGroup);
-        }
-        pGroup = pGroup->pNext;
+        ConPrintf(StdOut, L" %s", pContext->pszContextName);
+        pContext = pContext->pNext;
     }
+    ConPuts(StdOut, L"\n");
 }
 
 
-static
 VOID
-PrintSubcontexts(
-    _In_ PCONTEXT_ENTRY pContext)
+PrintCommandHelp(
+    _In_ PCONTEXT_ENTRY pContext,
+    _In_ PCOMMAND_ENTRY pCommand)
 {
-    if (pCurrentContext->pSubContextHead != NULL)
-    {
-        ConResPrintf(StdOut, IDS_SUBCONTEXT_HEADER);
-        pContext = pCurrentContext->pSubContextHead;
-        while (pContext != NULL)
-        {
-            ConPrintf(StdOut, L" %s", pContext->pszContextName);
-            pContext = pContext->pNext;
-        }
-        ConPuts(StdOut, L"\n");
-    }
+    WCHAR szBuffer[80];
+
+    LoadStringW(pContext->hModule, pCommand->dwCmdHlpToken, szBuffer, 80);
+    ConPrintf(StdOut, szBuffer);
 }
 
 
-BOOL
-ProcessHelp(
+VOID
+PrintGroupHelp(
     _In_ PCONTEXT_ENTRY pContext,
-    _In_ DWORD dwArgCount,
-    _In_ LPWSTR *argv,
-    _In_ DWORD dwCurrentIndex,
-    _In_ DWORD dwHelpLevel)
+    _In_ LPWSTR pszGroupName,
+    _In_ BOOL bRecurse)
 {
-    PCONTEXT_ENTRY pSubContext;
-    PCOMMAND_ENTRY pCommand;
     PCOMMAND_GROUP pGroup;
 
-    DPRINT("ProcessHelp(dwCurrentIndex %lu  dwArgCount %lu  dwHelpLevel %lu)\n", dwCurrentIndex, dwArgCount, dwHelpLevel);
-
-    if (dwHelpLevel == dwCurrentIndex)
-    {
-        ConResPrintf(StdOut, IDS_HELP_HEADER);
-        PrintContext(pContext);
-        PrintSubcontexts(pContext);
-        ConResPrintf(StdOut, IDS_HELP_FOOTER);
-        return TRUE;
-    }
-
-    pCommand = pContext->pCommandListHead;
-    while (pCommand != NULL)
+    if (bRecurse)
     {
-        if (_wcsicmp(argv[dwCurrentIndex], pCommand->pwszCmdToken) == 0) 
-        {
-            if (dwHelpLevel == dwCurrentIndex + 1)
-            {
-                PrintLongCommand(pContext, pCommand);
-                return TRUE;
-            }
-        }
-
-        pCommand = pCommand->pNext;
+        if (pContext != pRootContext)
+            PrintGroupHelp(pContext->pParentContext, pszGroupName, bRecurse);
     }
 
     pGroup = pContext->pGroupListHead;
     while (pGroup != NULL)
     {
-        if (_wcsicmp(argv[dwCurrentIndex], pGroup->pwszCmdGroupToken) == 0)
+        if (_wcsicmp(pszGroupName, pGroup->pwszCmdGroupToken) == 0)
         {
-            if (dwHelpLevel == dwCurrentIndex + 1)
-            {
-                ConResPrintf(StdOut, IDS_HELP_HEADER);
-                PrintGroup(pContext, argv[dwCurrentIndex], (dwHelpLevel == 1));
-                return TRUE;
-            }
-
-            pCommand = pGroup->pCommandListHead;
-            while (pCommand != NULL)
-            {
-                if ((dwArgCount > dwCurrentIndex + 1) && (_wcsicmp(argv[dwCurrentIndex + 1], pCommand->pwszCmdToken) == 0))
-                {
-                    if (dwHelpLevel == dwCurrentIndex + 2)
-                    {
-                        PrintLongCommand(pContext, pCommand);
-                        return TRUE;
-                    }
-                }
-
-                pCommand = pCommand->pNext;
-            }
-
-//            ConResPrintf(StdOut, IDS_HELP_HEADER);
-//            PrintGroup(pContext, pGroup);
-            return FALSE;
+            PrintCurrentContextHeader(pContext);
+            PrintShortGroupCommands(pContext, pGroup);
         }
-
         pGroup = pGroup->pNext;
     }
-
-    if (pContext == pCurrentContext)
-    {
-        pSubContext = pContext->pSubContextHead;
-        while (pSubContext != NULL)
-        {
-            if (_wcsicmp(argv[dwCurrentIndex], pSubContext->pszContextName) == 0) 
-            {
-                return ProcessHelp(pSubContext,
-                                   dwArgCount,
-                                   argv,
-                                   dwCurrentIndex + 1,
-                                   dwHelpLevel);
-            }
-
-            pSubContext = pSubContext->pNext;
-        }
-    }
-
-    return FALSE;
 }
 
 
-DWORD
-WINAPI
-HelpCommand(
-    LPCWSTR pwszMachine,
-    LPWSTR *ppwcArguments,
-    DWORD dwCurrentIndex,
-    DWORD dwArgCount,
-    DWORD dwFlags,
-    LPCVOID pvData,
-    BOOL *pbDone)
+VOID
+PrintContextHelp(
+    _In_ PCONTEXT_ENTRY pContext)
 {
-    return ERROR_SUCCESS;
+    ConResPrintf(StdOut, IDS_HELP_HEADER);
+    PrintContext(pContext);
+    PrintSubcontexts(pContext);
+    ConResPrintf(StdOut, IDS_HELP_FOOTER);
 }