Revision: 16728
http://sourceforge.net/p/edk2/code/16728
Author: jcarsey
Date: 2015-02-03 19:20:59 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
ShellPkg: Update Level1 profile commands response output
Updates to Level1 profile commands response output.
Updating Level1 profile commands source code to include command name as a
prefix in error message.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapands...@hp.com>
Reviewed-by: Jaben Carsey <jaben.car...@intel.com>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Exit.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.uni
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Exit.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Exit.c
2015-02-03 19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Exit.c
2015-02-03 19:20:59 UTC (rev 16728)
@@ -1,6 +1,7 @@
/** @file
Main file for exit shell level 1 function.
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -56,7 +57,7 @@
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
if (EFI_ERROR(Status)) {
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, ProblemParam);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, L"exit", ProblemParam);
FreePool(ProblemParam);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
@@ -71,7 +72,7 @@
if (Return != NULL) {
Status = ShellConvertStringToUint64(Return, &RetVal, FALSE, FALSE);
if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, Return);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV),
gShellLevel1HiiHandle, L"exit", Return);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
//
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
2015-02-03 19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
2015-02-03 19:20:59 UTC (rev 16728)
@@ -1,6 +1,7 @@
/** @file
Main file for endfor and for shell level 1 functions.
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -75,12 +76,12 @@
ASSERT_EFI_ERROR(Status);
if (!gEfiShellProtocol->BatchIsActive()) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"EndFor");
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"endfor");
return (SHELL_UNSUPPORTED);
}
if (gEfiShellParametersProtocol->Argc > 1) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle, L"endfor");
return (SHELL_INVALID_PARAMETER);
}
@@ -323,12 +324,12 @@
ASSERT_EFI_ERROR(Status);
if (!gEfiShellProtocol->BatchIsActive()) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"For");
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"for");
return (SHELL_UNSUPPORTED);
}
if (gEfiShellParametersProtocol->Argc < 4) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle, L"for");
return (SHELL_INVALID_PARAMETER);
}
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
2015-02-03 19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
2015-02-03 19:20:59 UTC (rev 16728)
@@ -1,6 +1,7 @@
/** @file
Main file for goto shell level 1 function.
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -58,7 +59,7 @@
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam,
TRUE);
if (EFI_ERROR(Status)) {
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, ProblemParam);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, L"goto", ProblemParam);
FreePool(ProblemParam);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
@@ -66,10 +67,10 @@
}
} else {
if (ShellCommandLineGetRawValue(Package, 2) != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle, L"goto");
ShellStatus = SHELL_INVALID_PARAMETER;
} else if (ShellCommandLineGetRawValue(Package, 1) == NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle, L"goto");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
Size = 0;
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c 2015-02-03
19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c 2015-02-03
19:20:59 UTC (rev 16728)
@@ -1,7 +1,7 @@
/** @file
Main file for If and else shell level 1 function.
- Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
+ Copyright (c) 2013 - 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -831,12 +831,12 @@
ASSERT_EFI_ERROR(Status);
if (!gEfiShellProtocol->BatchIsActive()) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"If");
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"if");
return (SHELL_UNSUPPORTED);
}
if (gEfiShellParametersProtocol->Argc < 3) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle, L"if");
return (SHELL_INVALID_PARAMETER);
}
@@ -914,12 +914,12 @@
// we are at the then
//
if (CurrentParameter+1 != gEfiShellParametersProtocol->Argc) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TEXT_AFTER_THEN),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TEXT_AFTER_THEN),
gShellLevel1HiiHandle, L"if");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
Status = PerformResultOperation(CurrentValue);
if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD),
gShellLevel1HiiHandle, gEfiShellParametersProtocol->Argv[CurrentParameter]);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD),
gShellLevel1HiiHandle, L"if",
gEfiShellParametersProtocol->Argv[CurrentParameter]);
ShellStatus = SHELL_INVALID_PARAMETER;
}
}
@@ -957,7 +957,7 @@
if ((Ending == EndTagOr && CurrentValue) || (Ending == EndTagAnd &&
!CurrentValue)) {
Status = PerformResultOperation(CurrentValue);
if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
(STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle,
gEfiShellParametersProtocol->Argv[CurrentParameter]);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
(STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle, L"if",
gEfiShellParametersProtocol->Argv[CurrentParameter]);
ShellStatus = SHELL_INVALID_PARAMETER;
}
break;
@@ -995,7 +995,7 @@
ASSERT_EFI_ERROR(CommandInit());
if (gEfiShellParametersProtocol->Argc > 1) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle, L"if");
return (SHELL_INVALID_PARAMETER);
}
@@ -1070,7 +1070,7 @@
ASSERT_EFI_ERROR(CommandInit());
if (gEfiShellParametersProtocol->Argc > 1) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle, L"if");
return (SHELL_INVALID_PARAMETER);
}
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
2015-02-03 19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
2015-02-03 19:20:59 UTC (rev 16728)
@@ -1,6 +1,7 @@
/** @file
Main file for Shift shell level 1 function.
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -35,7 +36,7 @@
ASSERT_EFI_ERROR(Status);
if (!gEfiShellProtocol->BatchIsActive()) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"Shift");
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT),
gShellLevel1HiiHandle, L"shift");
return (SHELL_UNSUPPORTED);
}
@@ -43,7 +44,7 @@
ASSERT(CurrentScriptFile != NULL);
if (CurrentScriptFile->Argc < 2) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle, L"shift");
return (SHELL_UNSUPPORTED);
}
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
2015-02-03 19:04:52 UTC (rev 16727)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
2015-02-03 19:20:59 UTC (rev 16728)
@@ -1,6 +1,7 @@
/** @file
Main file for stall shell level 1 function.
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -50,7 +51,7 @@
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam,
TRUE);
if (EFI_ERROR(Status)) {
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, ProblemParam);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),
gShellLevel1HiiHandle, L"stall", ProblemParam);
FreePool(ProblemParam);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
@@ -58,20 +59,20 @@
}
} else {
if (ShellCommandLineGetRawValue(Package, 2) != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),
gShellLevel1HiiHandle, L"stall");
ShellStatus = SHELL_INVALID_PARAMETER;
} else if (ShellCommandLineGetRawValue(Package, 1) == NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),
gShellLevel1HiiHandle, L"stall");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
Status = ShellConvertStringToUint64(ShellCommandLineGetRawValue(Package,
1), &Intermediate, FALSE, FALSE);
if (EFI_ERROR(Status) || ((UINT64)(UINTN)(Intermediate)) !=
Intermediate) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL),
gShellLevel1HiiHandle, ShellCommandLineGetRawValue(Package, 1));
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV),
gShellLevel1HiiHandle, L"stall", ShellCommandLineGetRawValue(Package, 1));
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
Status = gBS->Stall((UINTN)Intermediate);
if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_STALL_FAILED),
gShellLevel1HiiHandle, Status);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_STALL_FAILED),
gShellLevel1HiiHandle, L"stall");
ShellStatus = SHELL_DEVICE_ERROR;
}
}
Modified:
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.uni
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.uni
2015-02-03 19:04:52 UTC (rev 16727)
+++
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.uni
2015-02-03 19:20:59 UTC (rev 16728)
@@ -2,7 +2,7 @@
- @@ -52,37 +52,39 @@
-------+ ------ -
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
