ShellPkg: Fix wrong return status for Ifconfig.c

[mirror_edk2.git] / ShellPkg / Library / UefiShellNetwork1CommandsLib / Ifconfig.c

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
index e16d46a8ec4d81d02189f8737f946b8d62c3243c..fb6f57518422576e1d349fc3450906c5e6602333 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
@@ -423,7 +423,7 @@ IfConfigGetInterfaceInfo (
                   &HandleBuffer\r
                  );\r
   if (EFI_ERROR (Status) || (HandleNum == 0)) {\r
-    return EFI_ABORTED;\r
+    return Status;\r
   }\r
 \r
   //\r
@@ -587,11 +587,11 @@ ON_ERROR:
 \r
   @param[in]   IfList    The pointer of IfList(interface list).\r
 \r
-  @retval EFI_SUCCESS    The ifconfig command list processed successfully.\r
+  @retval SHELL_SUCCESS  The ifconfig command list processed successfully.\r
   @retval others         The ifconfig command list process failed.\r
 \r
 **/\r
-EFI_STATUS\r
+SHELL_STATUS\r
 IfConfigShowInterfaceInfo (\r
   IN LIST_ENTRY    *IfList\r
   )\r
@@ -783,7 +783,7 @@ IfConfigShowInterfaceInfo (
   \r
   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_BREAK), gShellNetwork1HiiHandle);\r
 \r
-  return EFI_SUCCESS;\r
+  return SHELL_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -791,16 +791,17 @@ IfConfigShowInterfaceInfo (
 \r
   @param[in]   IfList    The pointer of IfList(interface list).\r
 \r
-  @retval EFI_SUCCESS    The ifconfig command clean processed successfully.\r
+  @retval SHELL_SUCCESS  The ifconfig command clean processed successfully.\r
   @retval others         The ifconfig command clean process failed.\r
 \r
 **/\r
-EFI_STATUS\r
+SHELL_STATUS\r
 IfConfigClearInterfaceInfo (\r
   IN LIST_ENTRY    *IfList\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS                Status;  \r
+  SHELL_STATUS              ShellStatus;\r
   LIST_ENTRY                *Entry;\r
   LIST_ENTRY                *Next;\r
   IFCONFIG_INTERFACE_CB     *IfCb;\r
@@ -808,6 +809,7 @@ IfConfigClearInterfaceInfo (
 \r
   Policy = Ip4Config2PolicyDhcp;\r
   Status = EFI_SUCCESS;\r
+  ShellStatus = SHELL_SUCCESS;\r
 \r
   if (IsListEmpty (IfList)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
@@ -825,13 +827,13 @@ IfConfigClearInterfaceInfo (
                             sizeof (EFI_IP4_CONFIG2_POLICY),\r
                             &Policy\r
                             );\r
-\r
     if (EFI_ERROR (Status)) {\r
+      ShellStatus = SHELL_ACCESS_DENIED;\r
       break;\r
     }\r
   }\r
 \r
-  return Status;\r
+  return ShellStatus;\r
 }\r
 \r
 /**\r
@@ -840,18 +842,18 @@ IfConfigClearInterfaceInfo (
   @param[in]   IfList    The pointer of IfList(interface list).\r
   @param[in]   VarArg    The pointer of ARG_LIST(Args with "-s" option).\r
 \r
-  @retval EFI_SUCCESS    The ifconfig command set processed successfully.\r
+  @retval SHELL_SUCCESS  The ifconfig command set processed successfully.\r
   @retval others         The ifconfig command set process failed.\r
 \r
 **/\r
-EFI_STATUS\r
+SHELL_STATUS\r
 IfConfigSetInterfaceInfo (\r
   IN LIST_ENTRY    *IfList,\r
   IN ARG_LIST      *VarArg\r
   )\r
 {\r
-\r
   EFI_STATUS                       Status;\r
+  SHELL_STATUS                     ShellStatus;\r
   IFCONFIG_INTERFACE_CB            *IfCb;\r
   VAR_CHECK_CODE                   CheckCode;\r
   EFI_EVENT                        TimeOutEvt;\r
@@ -872,7 +874,7 @@ IfConfigSetInterfaceInfo (
 \r
   if (IsListEmpty (IfList)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
-    return EFI_INVALID_PARAMETER;\r
+    return SHELL_INVALID_PARAMETER;\r
   }\r
   \r
   //\r
@@ -880,6 +882,7 @@ IfConfigSetInterfaceInfo (
   //\r
   IfCb   = NET_LIST_USER_STRUCT (IfList->ForwardLink, IFCONFIG_INTERFACE_CB, Link);\r
   Status = EFI_SUCCESS;\r
+  ShellStatus = SHELL_SUCCESS;\r
 \r
   //\r
   // Initialize check list mechanism.\r
@@ -901,6 +904,7 @@ IfConfigSetInterfaceInfo (
                   &TimeOutEvt\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    ShellStatus = SHELL_ACCESS_DENIED;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -912,6 +916,7 @@ IfConfigSetInterfaceInfo (
                   &MappedEvt\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    ShellStatus = SHELL_ACCESS_DENIED;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -969,6 +974,7 @@ IfConfigSetInterfaceInfo (
       if (IfCb->Policy == Ip4Config2PolicyDhcp) {\r
         Status = IfConfigStartIp4 (IfCb->NicHandle, gImageHandle);\r
         if (EFI_ERROR(Status)) {\r
+          ShellStatus = SHELL_ACCESS_DENIED;\r
           goto ON_EXIT;\r
         }\r
       } else {\r
@@ -983,6 +989,7 @@ IfConfigSetInterfaceInfo (
                                 &Policy\r
                                 );\r
         if (EFI_ERROR(Status)) {\r
+          ShellStatus = SHELL_ACCESS_DENIED;\r
           goto ON_EXIT;\r
         }\r
       }\r
@@ -1000,8 +1007,8 @@ IfConfigSetInterfaceInfo (
                               sizeof (EFI_IP4_CONFIG2_POLICY),\r
                               &Policy\r
                               );\r
-\r
       if (EFI_ERROR(Status)) {\r
+        ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
 \r
@@ -1014,6 +1021,7 @@ IfConfigSetInterfaceInfo (
       //\r
       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.Address);\r
       if (EFI_ERROR(Status)) {\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
 \r
@@ -1023,6 +1031,7 @@ IfConfigSetInterfaceInfo (
       VarArg = VarArg->Next;\r
       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.SubnetMask);\r
       if (EFI_ERROR(Status)) {\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
 \r
@@ -1032,6 +1041,7 @@ IfConfigSetInterfaceInfo (
       VarArg = VarArg->Next;\r
       Status = NetLibStrToIp4 (VarArg->Arg, &Gateway);\r
       if (EFI_ERROR(Status)) {\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
       \r
@@ -1043,6 +1053,7 @@ IfConfigSetInterfaceInfo (
                               MappedEvt\r
                               );\r
       if (EFI_ERROR (Status)) {\r
+        ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
 \r
@@ -1071,9 +1082,10 @@ IfConfigSetInterfaceInfo (
                      Ip4Config2DataTypeManualAddress,\r
                      MappedEvt\r
                      );\r
-\r
+      \r
       if (EFI_ERROR (Status)) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_SET_ADDR_FAILED), gShellNetwork1HiiHandle, Status);\r
+        ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
 \r
@@ -1088,6 +1100,11 @@ IfConfigSetInterfaceInfo (
                               DataSize,\r
                               &Gateway\r
                               );\r
+      if (EFI_ERROR (Status)) {\r
+        ShellStatus = SHELL_ACCESS_DENIED;\r
+        goto ON_EXIT;\r
+      }\r
+      \r
       VarArg = VarArg->Next;\r
       \r
     } else if (StrCmp (VarArg->Arg, L"dns") == 0) {\r
@@ -1109,6 +1126,7 @@ IfConfigSetInterfaceInfo (
       while (Tmp != NULL) {\r
         Status = NetLibStrToIp4 (Tmp->Arg, Dns + Index);\r
         if (EFI_ERROR(Status)) {\r
+          ShellStatus = SHELL_INVALID_PARAMETER;\r
           goto ON_EXIT;\r
         }\r
         Index ++;\r
@@ -1128,6 +1146,10 @@ IfConfigSetInterfaceInfo (
                               DataSize,\r
                               Dns\r
                               );\r
+      if (EFI_ERROR (Status)) {\r
+        ShellStatus = SHELL_ACCESS_DENIED;\r
+        goto ON_EXIT;\r
+      }\r
     }\r
   }\r
 \r
@@ -1136,7 +1158,7 @@ ON_EXIT:
     FreePool (Dns);\r
   }\r
   \r
-  return Status;\r
+  return ShellStatus;\r
 \r
 }\r
 \r
@@ -1145,16 +1167,19 @@ ON_EXIT:
 \r
   @param[in]   Private    The pointer of IFCONFIG_PRIVATE_DATA.\r
 \r
-  @retval EFI_SUCCESS    ifconfig command processed successfully.\r
+  @retval SHELL_SUCCESS  ifconfig command processed successfully.\r
   @retval others         The ifconfig command process failed.\r
 \r
 **/\r
-EFI_STATUS\r
+SHELL_STATUS\r
 IfConfig (\r
   IN IFCONFIG_PRIVATE_DATA    *Private\r
   )\r
 {\r
   EFI_STATUS    Status;\r
+  SHELL_STATUS  ShellStatus;\r
+\r
+  ShellStatus = SHELL_SUCCESS;\r
 \r
   //\r
   // Get configure information of all interfaces.\r
@@ -1163,31 +1188,30 @@ IfConfig (
              Private->IfName,\r
              &Private->IfList\r
              );\r
-\r
   if (EFI_ERROR (Status)) {\r
+    ShellStatus = SHELL_NOT_FOUND; \r
     goto ON_EXIT;\r
   }\r
 \r
   switch (Private->OpCode) {\r
   case IfConfigOpList:\r
-    Status = IfConfigShowInterfaceInfo (&Private->IfList);\r
+    ShellStatus = IfConfigShowInterfaceInfo (&Private->IfList);\r
     break;\r
 \r
   case IfConfigOpClear:\r
-    Status = IfConfigClearInterfaceInfo (&Private->IfList);\r
+    ShellStatus = IfConfigClearInterfaceInfo (&Private->IfList);\r
     break;\r
 \r
   case IfConfigOpSet:\r
-    Status = IfConfigSetInterfaceInfo (&Private->IfList, Private->VarArg);\r
+    ShellStatus = IfConfigSetInterfaceInfo (&Private->IfList, Private->VarArg);\r
     break;\r
 \r
   default:\r
-    Status = EFI_ABORTED;\r
+    ShellStatus = SHELL_UNSUPPORTED;\r
   }\r
 \r
 ON_EXIT:\r
-\r
-  return Status;\r
+  return ShellStatus;\r
 }\r
 \r
 /**\r
@@ -1267,16 +1291,26 @@ ShellCommandRunIfconfig (
   EFI_STATUS                Status;\r
   IFCONFIG_PRIVATE_DATA     *Private;\r
   LIST_ENTRY                *ParamPackage;\r
+  SHELL_STATUS              ShellStatus;\r
   CONST CHAR16              *ValueStr;\r
   ARG_LIST                  *ArgList;\r
   CHAR16                    *ProblemParam;\r
   CHAR16                    *Str;\r
-\r
+  \r
+  Status = EFI_INVALID_PARAMETER;\r
   Private = NULL;\r
+  ShellStatus = SHELL_SUCCESS;\r
 \r
   Status = ShellCommandLineParseEx (mIfConfigCheckList, &ParamPackage, &ProblemParam, TRUE, FALSE);\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ifconfig", ProblemParam);\r
+    if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ifconfig", ProblemParam);\r
+      FreePool(ProblemParam);\r
+      ShellStatus = SHELL_INVALID_PARAMETER;\r
+    } else {\r
+      ASSERT(FALSE);\r
+    }\r
+    \r
     goto ON_EXIT;\r
   }\r
 \r
@@ -1285,6 +1319,7 @@ ShellCommandRunIfconfig (
   //\r
   if (ShellCommandLineGetFlag (ParamPackage, L"-c")) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_UNSUPPORTED_OPTION), gShellNetwork1HiiHandle,L"-c");\r
+    ShellStatus = SHELL_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -1294,6 +1329,7 @@ ShellCommandRunIfconfig (
   if (!ShellCommandLineGetFlag (ParamPackage, L"-r") && !ShellCommandLineGetFlag (ParamPackage, L"-s") &&\r
       !ShellCommandLineGetFlag (ParamPackage, L"-l")) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_OPTION), gShellNetwork1HiiHandle);\r
+    ShellStatus = SHELL_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -1304,15 +1340,13 @@ ShellCommandRunIfconfig (
       ((ShellCommandLineGetFlag (ParamPackage, L"-r")) && (ShellCommandLineGetFlag (ParamPackage, L"-l"))) ||\r
       ((ShellCommandLineGetFlag (ParamPackage, L"-s")) && (ShellCommandLineGetFlag (ParamPackage, L"-l")))) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellNetwork1HiiHandle, L"ifconfig");\r
+    ShellStatus = SHELL_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
 \r
-  Status = EFI_INVALID_PARAMETER;\r
-\r
   Private = AllocateZeroPool (sizeof (IFCONFIG_PRIVATE_DATA));\r
-\r
   if (Private == NULL) {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
+    ShellStatus = SHELL_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -1351,6 +1385,7 @@ ShellCommandRunIfconfig (
     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-s");\r
     if (ValueStr == NULL) {\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_INTERFACE), gShellNetwork1HiiHandle);\r
+      ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
     \r
@@ -1367,6 +1402,7 @@ ShellCommandRunIfconfig (
 \r
     if (Private->IfName == NULL || Private->VarArg == NULL) {\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);\r
+      ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
   }\r
@@ -1374,7 +1410,7 @@ ShellCommandRunIfconfig (
   //\r
   // Main process of ifconfig.\r
   //\r
-  Status = IfConfig (Private);\r
+  ShellStatus = IfConfig (Private);\r
 \r
 ON_EXIT:\r
 \r
@@ -1384,5 +1420,5 @@ ON_EXIT:
     IfConfigCleanup (Private);\r
   }\r
 \r
-  return Status;\r
+  return ShellStatus;\r
 }\r