Shell/alias: Print detailed error when deleting alias

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel3CommandsLib / Alias.c

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
index 1161746cc789380515192f6f9f56b811e7043533..daf46a9f657a4ae034bb3e527654500d518af581 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
@@ -2,7 +2,7 @@
   Main file for Alias shell level 3 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved. <BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -24,7 +24,6 @@
   @return any return code from GetNextVariableName except EFI_NOT_FOUND\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PrintAllShellAlias(\r
   VOID\r
   )\r
@@ -92,6 +91,8 @@ ShellCommandRunAlias (
   CONST CHAR16        *Param1;\r
   CONST CHAR16        *Param2;\r
   CHAR16              *CleanParam2;\r
+  CONST CHAR16        *ConstAliasVal;\r
+  BOOLEAN             Volatile;\r
 \r
   ProblemParam        = NULL;\r
   ShellStatus         = SHELL_SUCCESS;\r
@@ -150,6 +151,18 @@ ShellCommandRunAlias (
       // delete an alias\r
       //\r
       Status = gEfiShellProtocol->SetAlias(Param1, NULL, TRUE, FALSE);\r
+      if (EFI_ERROR(Status)) {\r
+        if (Status == EFI_ACCESS_DENIED) {\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel3HiiHandle, L"alias");\r
+          ShellStatus = SHELL_ACCESS_DENIED;\r
+        } else if (Status == EFI_NOT_FOUND) {\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_NOT_FOUND), gShellLevel3HiiHandle, L"alias", Param1);\r
+          ShellStatus = SHELL_NOT_FOUND;\r
+        } else {\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel3HiiHandle, L"alias", Status);\r
+          ShellStatus = SHELL_DEVICE_ERROR;\r
+        }\r
+      }\r
     } else if (ShellCommandLineGetCount(Package) == 3) {\r
       //\r
       // must be adding an alias\r
@@ -165,8 +178,19 @@ ShellCommandRunAlias (
         }\r
       }\r
     } else if (ShellCommandLineGetCount(Package) == 2) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel3HiiHandle, L"alias");  \r
-      ShellStatus = SHELL_INVALID_PARAMETER;\r
+      //\r
+      // print out a single alias\r
+      //\r
+      ConstAliasVal = gEfiShellProtocol->GetAlias(Param1, &Volatile);\r
+      if (ConstAliasVal == NULL) {\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel3HiiHandle, L"alias", Param1);\r
+        ShellStatus = SHELL_INVALID_PARAMETER;\r
+      } else {\r
+        if (ShellCommandIsOnAliasList(Param1)) {\r
+          Volatile = FALSE;\r
+        }\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_ALIAS_OUTPUT), gShellLevel3HiiHandle, !Volatile?L' ':L'*', Param1, ConstAliasVal);\r
+      }      \r
     } else {\r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r