sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow Shell specification to make sure the “command.man” file is always used no matter “command.efi -?” or “command -?” is typed.

Browse Source 
Signed-off-by: Shumin Qiu <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14947 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Shumin Qiu
2013-12-09 02:24:39 +00:00
committed by shenshushi
parent 447d264115
commit 42f75495f3
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ShellPkg/Application/Shell/ShellManParser.c
View File

@ -492,19 +492,6 @@ ManFileFindTitleSection(
StrCpy(TitleString, L".TH "); StrCpy(TitleString, L".TH ");
StrCat(TitleString, Command); StrCat(TitleString, Command);
//
// If the "name" ends with .efi we can safely chop that off since "help foo.efi" and "help foo"
// should produce the same results.
//
if ((StrLen(Command)> 4)
&& (TitleString[StrLen(TitleString)-1] == L'i' || TitleString[StrLen(TitleString)-1] == L'I')
&& (TitleString[StrLen(TitleString)-2] == L'f' || TitleString[StrLen(TitleString)-2] == L'F')
&& (TitleString[StrLen(TitleString)-3] == L'e' || TitleString[StrLen(TitleString)-2] == L'E')
&& (TitleString[StrLen(TitleString)-4] == L'.')
) {
TitleString[StrLen(TitleString)-4] = CHAR_NULL;
}
TitleLen = StrLen(TitleString); TitleLen = StrLen(TitleString);
for (;!ShellFileHandleEof(Handle);Size = 1024) { for (;!ShellFileHandleEof(Handle);Size = 1024) {
Status = ShellFileHandleReadLine(Handle, ReadLine, &Size, TRUE, Ascii); Status = ShellFileHandleReadLine(Handle, ReadLine, &Size, TRUE, Ascii);

18
ShellPkg/Application/Shell/ShellProtocol.c
View File

@ -2769,16 +2769,34 @@ EfiShellGetHelpText(
) )
{ {
CONST CHAR16 *ManFileName; CONST CHAR16 *ManFileName;
CHAR16 *FixCommand;
EFI_STATUS Status;
ASSERT(HelpText != NULL); ASSERT(HelpText != NULL);
FixCommand = NULL;
ManFileName = ShellCommandGetManFileNameHandler(Command); ManFileName = ShellCommandGetManFileNameHandler(Command);
if (ManFileName != NULL) { if (ManFileName != NULL) {
return (ProcessManFile(ManFileName, Command, Sections, NULL, HelpText)); return (ProcessManFile(ManFileName, Command, Sections, NULL, HelpText));
} else {
if ((StrLen(Command)> 4)
&& (Command[StrLen(Command)-1] == L'i' || Command[StrLen(Command)-1] == L'I')
&& (Command[StrLen(Command)-2] == L'f' || Command[StrLen(Command)-2] == L'F')
&& (Command[StrLen(Command)-3] == L'e' || Command[StrLen(Command)-3] == L'E')
&& (Command[StrLen(Command)-4] == L'.')
) {
FixCommand = AllocateZeroPool(StrSize(Command) - 4 * sizeof (CHAR16));
ASSERT(FixCommand != NULL);
StrnCpy(FixCommand, Command, StrLen(Command)-4);
Status = ProcessManFile(FixCommand, FixCommand, Sections, NULL, HelpText);
FreePool(FixCommand);
return Status;
} else { } else {
return (ProcessManFile(Command, Command, Sections, NULL, HelpText)); return (ProcessManFile(Command, Command, Sections, NULL, HelpText));
} }
}
} }
/** /**