Skip to content

ShellPkg/UefiShellLevel3: Code cleanup/refactor #12512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pierregondois wants to merge 8 commits into from
Closed

ShellPkg/UefiShellLevel3: Code cleanup/refactor #12512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a5947e
ShellPkg/Cls: Factorize color parsing
pierregondois Apr 6, 2026
0508c21
ShellPkg/Type: Factorize character display
pierregondois Apr 6, 2026
c18fa14
ShellPkg/Help: Free package on all paths
pierregondois Apr 6, 2026
868ac78
ShellPkg/UefiShellLevel3: Return if ShellCommandLineParse() failed
pierregondois Apr 28, 2026
e669742
ShellPkg/UefiShellLevel3: Extract MainCmdXXX() function
pierregondois Apr 28, 2026
504f7e3
ShellPkg/UefiShellLevel3: Extract ProcessFileList() function
pierregondois Apr 28, 2026
3b1a5d7
ShellPkg/UefiShellLevel3: Lower indentation level in MainCmdXXX()
pierregondois Apr 28, 2026
e97d0ee
todo
pierregondois Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 114 additions & 94 deletions ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,113 @@ ShellLevel3CommandsLibSetAlias (
return ShellStatus;
}

/** Main function of the 'Alias' command.

@param[in] Package List of input parameter for the command.
**/
STATIC
SHELL_STATUS
MainCmdAlias (
LIST_ENTRY *Package
)
{
SHELL_STATUS ShellStatus;
CONST CHAR16 *Param1;
CONST CHAR16 *Param2;
CONST CHAR16 *ParamStrD;
CHAR16 *CleanParam2;
BOOLEAN DeleteFlag;
BOOLEAN VolatileFlag;

ShellStatus = SHELL_SUCCESS;
CleanParam2 = NULL;

Param1 = ShellCommandLineGetRawValue (Package, 1);
Param2 = ShellCommandLineGetRawValue (Package, 2);

DeleteFlag = ShellCommandLineGetFlag (Package, L"-d");
VolatileFlag = ShellCommandLineGetFlag (Package, L"-v");

if (Param2 != NULL) {
CleanParam2 = AllocateCopyPool (StrSize (Param2), Param2);
if (CleanParam2 == NULL) {
return SHELL_OUT_OF_RESOURCES;
}

if ((CleanParam2[0] == L'\"') && (CleanParam2[StrLen (CleanParam2)-1] == L'\"')) {
CleanParam2[StrLen (CleanParam2)-1] = L'\0';
CopyMem (CleanParam2, CleanParam2 + 1, StrSize (CleanParam2) - sizeof (CleanParam2[0]));
}
}

if (!DeleteFlag && !VolatileFlag) {
switch (ShellCommandLineGetCount (Package)) {
case 1:
//
// "alias"
//
ShellStatus = PrintAllShellAlias ();
break;
case 2:
//
// "alias Param1"
//
ShellStatus = PrintSingleShellAlias (Param1);
break;
case 3:
//
// "alias Param1 CleanParam2"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (CleanParam2, Param1, FALSE, VolatileFlag);
break;
default:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
}
} else if (DeleteFlag) {
if (VolatileFlag || (ShellCommandLineGetCount (Package) > 1)) {
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
ParamStrD = ShellCommandLineGetValue (Package, L"-d");
if (ParamStrD == NULL) {
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
//
// Delete an alias: "alias -d ParamStrD"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (ParamStrD, NULL, TRUE, FALSE);
}
}
} else {
//
// Set volatile alias.
//
ASSERT (VolatileFlag);
ASSERT (!DeleteFlag);
switch (ShellCommandLineGetCount (Package)) {
case 1:
case 2:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
break;
case 3:
//
// "alias -v Param1 CleanParam2"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (CleanParam2, Param1, FALSE, VolatileFlag);
break;
default:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
}
}

SHELL_FREE_NON_NULL (CleanParam2);
return ShellStatus;
}

STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
{ L"-v", TypeFlag },
{ L"-d", TypeValue },
Expand All @@ -160,16 +267,9 @@ ShellCommandRunAlias (
LIST_ENTRY *Package;
CHAR16 *ProblemParam;
SHELL_STATUS ShellStatus;
CONST CHAR16 *Param1;
CONST CHAR16 *Param2;
CONST CHAR16 *ParamStrD;
CHAR16 *CleanParam2;
BOOLEAN DeleteFlag;
BOOLEAN VolatileFlag;

ProblemParam = NULL;
ShellStatus = SHELL_SUCCESS;
CleanParam2 = NULL;

//
// initialize the shell lib (we must be in non-auto-init...)
Expand All @@ -192,96 +292,16 @@ ShellCommandRunAlias (
} else {
ASSERT (FALSE);
}
} else {
Param1 = ShellCommandLineGetRawValue (Package, 1);
Param2 = ShellCommandLineGetRawValue (Package, 2);

DeleteFlag = ShellCommandLineGetFlag (Package, L"-d");
VolatileFlag = ShellCommandLineGetFlag (Package, L"-v");

if (Param2 != NULL) {
CleanParam2 = AllocateCopyPool (StrSize (Param2), Param2);
if (CleanParam2 == NULL) {
ShellCommandLineFreeVarList (Package);
return SHELL_OUT_OF_RESOURCES;
}

if ((CleanParam2[0] == L'\"') && (CleanParam2[StrLen (CleanParam2)-1] == L'\"')) {
CleanParam2[StrLen (CleanParam2)-1] = L'\0';
CopyMem (CleanParam2, CleanParam2 + 1, StrSize (CleanParam2) - sizeof (CleanParam2[0]));
}
}
return ShellStatus;
}

if (!DeleteFlag && !VolatileFlag) {
switch (ShellCommandLineGetCount (Package)) {
case 1:
//
// "alias"
//
ShellStatus = PrintAllShellAlias ();
break;
case 2:
//
// "alias Param1"
//
ShellStatus = PrintSingleShellAlias (Param1);
break;
case 3:
//
// "alias Param1 CleanParam2"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (CleanParam2, Param1, FALSE, VolatileFlag);
break;
default:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
}
} else if (DeleteFlag) {
if (VolatileFlag || (ShellCommandLineGetCount (Package) > 1)) {
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
ParamStrD = ShellCommandLineGetValue (Package, L"-d");
if (ParamStrD == NULL) {
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
//
// Delete an alias: "alias -d ParamStrD"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (ParamStrD, NULL, TRUE, FALSE);
}
}
} else {
//
// Set volatile alias.
//
ASSERT (VolatileFlag);
ASSERT (!DeleteFlag);
switch (ShellCommandLineGetCount (Package)) {
case 1:
case 2:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
break;
case 3:
//
// "alias -v Param1 CleanParam2"
//
ShellStatus = ShellLevel3CommandsLibSetAlias (CleanParam2, Param1, FALSE, VolatileFlag);
break;
default:
ShellPrintHiiDefaultEx (STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel3HiiHandle, L"alias");
ShellStatus = SHELL_INVALID_PARAMETER;
}
}
ShellStatus = MainCmdAlias (Package);

//
// free the command line package
//
ShellCommandLineFreeVarList (Package);
}
//
// free the command line package
//
ShellCommandLineFreeVarList (Package);

SHELL_FREE_NON_NULL (CleanParam2);
return (ShellStatus);
}
Loading
Loading