ShellPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ShellPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Michael Kubacki
committed by
mergify[bot]
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -10,7 +10,7 @@
|
||||
#include "UefiShellLevel2CommandsLib.h"
|
||||
#include <Guid/FileSystemInfo.h>
|
||||
|
||||
UINTN mDayOfMonth[] = {31, 28, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30};
|
||||
UINTN mDayOfMonth[] = { 31, 28, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30 };
|
||||
|
||||
/**
|
||||
print out the standard format output volume entry.
|
||||
@ -18,8 +18,8 @@ UINTN mDayOfMonth[] = {31, 28, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30};
|
||||
@param[in] TheList a list of files from the volume.
|
||||
**/
|
||||
EFI_STATUS
|
||||
PrintSfoVolumeInfoTableEntry(
|
||||
IN CONST EFI_SHELL_FILE_INFO *TheList
|
||||
PrintSfoVolumeInfoTableEntry (
|
||||
IN CONST EFI_SHELL_FILE_INFO *TheList
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
@ -33,77 +33,79 @@ PrintSfoVolumeInfoTableEntry(
|
||||
//
|
||||
// Get the first valid handle (directories)
|
||||
//
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&TheList->Link)
|
||||
; !IsNull(&TheList->Link, &Node->Link) && Node->Handle == NULL
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&TheList->Link, &Node->Link)
|
||||
);
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&TheList->Link)
|
||||
; !IsNull (&TheList->Link, &Node->Link) && Node->Handle == NULL
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode (&TheList->Link, &Node->Link)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
if (Node->Handle == NULL) {
|
||||
DirectoryName = GetFullyQualifiedPath(((EFI_SHELL_FILE_INFO *)GetFirstNode(&TheList->Link))->FullName);
|
||||
DirectoryName = GetFullyQualifiedPath (((EFI_SHELL_FILE_INFO *)GetFirstNode (&TheList->Link))->FullName);
|
||||
|
||||
//
|
||||
// We need to open something up to get system information
|
||||
//
|
||||
Status = gEfiShellProtocol->OpenFileByName(
|
||||
DirectoryName,
|
||||
&ShellFileHandle,
|
||||
EFI_FILE_MODE_READ
|
||||
);
|
||||
Status = gEfiShellProtocol->OpenFileByName (
|
||||
DirectoryName,
|
||||
&ShellFileHandle,
|
||||
EFI_FILE_MODE_READ
|
||||
);
|
||||
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
FreePool(DirectoryName);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
FreePool (DirectoryName);
|
||||
|
||||
//
|
||||
// Get the Volume Info from ShellFileHandle
|
||||
//
|
||||
SysInfo = NULL;
|
||||
SysInfoSize = 0;
|
||||
EfiFpHandle = ConvertShellHandleToEfiFileProtocol(ShellFileHandle);
|
||||
Status = EfiFpHandle->GetInfo(
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
EfiFpHandle = ConvertShellHandleToEfiFileProtocol (ShellFileHandle);
|
||||
Status = EfiFpHandle->GetInfo (
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
|
||||
if (Status == EFI_BUFFER_TOO_SMALL) {
|
||||
SysInfo = AllocateZeroPool(SysInfoSize);
|
||||
Status = EfiFpHandle->GetInfo(
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
SysInfo = AllocateZeroPool (SysInfoSize);
|
||||
Status = EfiFpHandle->GetInfo (
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
}
|
||||
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
gEfiShellProtocol->CloseFile(ShellFileHandle);
|
||||
gEfiShellProtocol->CloseFile (ShellFileHandle);
|
||||
} else {
|
||||
//
|
||||
// Get the Volume Info from Node->Handle
|
||||
//
|
||||
SysInfo = NULL;
|
||||
SysInfo = NULL;
|
||||
SysInfoSize = 0;
|
||||
EfiFpHandle = ConvertShellHandleToEfiFileProtocol(Node->Handle);
|
||||
Status = EfiFpHandle->GetInfo(
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
EfiFpHandle = ConvertShellHandleToEfiFileProtocol (Node->Handle);
|
||||
Status = EfiFpHandle->GetInfo (
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
|
||||
if (Status == EFI_BUFFER_TOO_SMALL) {
|
||||
SysInfo = AllocateZeroPool(SysInfoSize);
|
||||
Status = EfiFpHandle->GetInfo(
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
SysInfo = AllocateZeroPool (SysInfoSize);
|
||||
Status = EfiFpHandle->GetInfo (
|
||||
EfiFpHandle,
|
||||
&gEfiFileSystemInfoGuid,
|
||||
&SysInfoSize,
|
||||
SysInfo
|
||||
);
|
||||
}
|
||||
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
ShellPrintHiiEx (
|
||||
@ -117,7 +119,7 @@ PrintSfoVolumeInfoTableEntry(
|
||||
//
|
||||
// print VolumeInfo table
|
||||
//
|
||||
ASSERT(SysInfo != NULL);
|
||||
ASSERT (SysInfo != NULL);
|
||||
ShellPrintHiiEx (
|
||||
0,
|
||||
gST->ConOut->Mode->CursorRow,
|
||||
@ -126,12 +128,12 @@ PrintSfoVolumeInfoTableEntry(
|
||||
gShellLevel2HiiHandle,
|
||||
SysInfo->VolumeLabel,
|
||||
SysInfo->VolumeSize,
|
||||
SysInfo->ReadOnly?L"TRUE":L"FALSE",
|
||||
SysInfo->ReadOnly ? L"TRUE" : L"FALSE",
|
||||
SysInfo->FreeSpace,
|
||||
SysInfo->BlockSize
|
||||
);
|
||||
|
||||
SHELL_FREE_NON_NULL(SysInfo);
|
||||
SHELL_FREE_NON_NULL (SysInfo);
|
||||
|
||||
return (Status);
|
||||
}
|
||||
@ -147,7 +149,7 @@ PrintSfoVolumeInfoTableEntry(
|
||||
|
||||
**/
|
||||
VOID
|
||||
PrintFileInformation(
|
||||
PrintFileInformation (
|
||||
IN CONST BOOLEAN Sfo,
|
||||
IN CONST EFI_SHELL_FILE_INFO *TheNode,
|
||||
IN UINT64 *Files,
|
||||
@ -155,10 +157,10 @@ PrintFileInformation(
|
||||
IN UINT64 *Dirs
|
||||
)
|
||||
{
|
||||
ASSERT(Files != NULL);
|
||||
ASSERT(Size != NULL);
|
||||
ASSERT(Dirs != NULL);
|
||||
ASSERT(TheNode != NULL);
|
||||
ASSERT (Files != NULL);
|
||||
ASSERT (Size != NULL);
|
||||
ASSERT (Dirs != NULL);
|
||||
ASSERT (TheNode != NULL);
|
||||
|
||||
if (Sfo) {
|
||||
//
|
||||
@ -173,11 +175,11 @@ PrintFileInformation(
|
||||
TheNode->FullName,
|
||||
TheNode->Info->FileSize,
|
||||
TheNode->Info->PhysicalSize,
|
||||
(TheNode->Info->Attribute & EFI_FILE_ARCHIVE) != 0?L"a":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"d":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_HIDDEN) != 0?L"h":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L"r":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_SYSTEM) != 0?L"s":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_ARCHIVE) != 0 ? L"a" : L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0 ? L"d" : L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_HIDDEN) != 0 ? L"h" : L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0 ? L"r" : L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_SYSTEM) != 0 ? L"s" : L"",
|
||||
TheNode->Info->CreateTime.Hour,
|
||||
TheNode->Info->CreateTime.Minute,
|
||||
TheNode->Info->CreateTime.Second,
|
||||
@ -209,8 +211,8 @@ PrintFileInformation(
|
||||
STRING_TOKEN (STR_LS_LINE_START_ALL),
|
||||
gShellLevel2HiiHandle,
|
||||
&TheNode->Info->ModificationTime,
|
||||
(TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"<DIR>":L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L'r':L' ',
|
||||
(TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0 ? L"<DIR>" : L"",
|
||||
(TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0 ? L'r' : L' ',
|
||||
TheNode->Info->FileSize
|
||||
);
|
||||
if (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) {
|
||||
@ -226,9 +228,10 @@ PrintFileInformation(
|
||||
} else {
|
||||
(*Files)++;
|
||||
(*Size) += TheNode->Info->FileSize;
|
||||
if ( (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".nsh", (CHAR16*)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)
|
||||
|| (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".efi", (CHAR16*)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)
|
||||
){
|
||||
if ( (gUnicodeCollation->StriColl (gUnicodeCollation, (CHAR16 *)L".nsh", (CHAR16 *)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)
|
||||
|| (gUnicodeCollation->StriColl (gUnicodeCollation, (CHAR16 *)L".efi", (CHAR16 *)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)
|
||||
)
|
||||
{
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
@ -257,16 +260,16 @@ PrintFileInformation(
|
||||
@param[in] Path String with starting path.
|
||||
**/
|
||||
VOID
|
||||
PrintNonSfoHeader(
|
||||
IN CONST CHAR16 *Path
|
||||
PrintNonSfoHeader (
|
||||
IN CONST CHAR16 *Path
|
||||
)
|
||||
{
|
||||
CHAR16 *DirectoryName;
|
||||
CHAR16 *DirectoryName;
|
||||
|
||||
//
|
||||
// get directory name from path...
|
||||
//
|
||||
DirectoryName = GetFullyQualifiedPath(Path);
|
||||
DirectoryName = GetFullyQualifiedPath (Path);
|
||||
|
||||
if (DirectoryName != NULL) {
|
||||
//
|
||||
@ -281,7 +284,7 @@ PrintNonSfoHeader(
|
||||
DirectoryName
|
||||
);
|
||||
|
||||
SHELL_FREE_NON_NULL(DirectoryName);
|
||||
SHELL_FREE_NON_NULL (DirectoryName);
|
||||
}
|
||||
}
|
||||
|
||||
@ -293,10 +296,10 @@ PrintNonSfoHeader(
|
||||
@param[in] Dirs The number of directories.
|
||||
**/
|
||||
VOID
|
||||
PrintNonSfoFooter(
|
||||
IN UINT64 Files,
|
||||
IN UINT64 Size,
|
||||
IN UINT64 Dirs
|
||||
PrintNonSfoFooter (
|
||||
IN UINT64 Files,
|
||||
IN UINT64 Size,
|
||||
IN UINT64 Dirs
|
||||
)
|
||||
{
|
||||
//
|
||||
@ -311,7 +314,7 @@ PrintNonSfoFooter(
|
||||
Files,
|
||||
Size,
|
||||
Dirs
|
||||
);
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -322,33 +325,33 @@ PrintNonSfoFooter(
|
||||
**/
|
||||
VOID
|
||||
FileTimeToLocalTime (
|
||||
IN EFI_TIME *Time,
|
||||
IN INT16 LocalTimeZone
|
||||
IN EFI_TIME *Time,
|
||||
IN INT16 LocalTimeZone
|
||||
)
|
||||
{
|
||||
INTN MinuteDiff;
|
||||
INTN TempMinute;
|
||||
INTN HourNumberOfTempMinute;
|
||||
INTN TempHour;
|
||||
INTN DayNumberOfTempHour;
|
||||
INTN TempDay;
|
||||
INTN MonthNumberOfTempDay;
|
||||
INTN TempMonth;
|
||||
INTN YearNumberOfTempMonth;
|
||||
INTN MonthRecord;
|
||||
INTN MinuteDiff;
|
||||
INTN TempMinute;
|
||||
INTN HourNumberOfTempMinute;
|
||||
INTN TempHour;
|
||||
INTN DayNumberOfTempHour;
|
||||
INTN TempDay;
|
||||
INTN MonthNumberOfTempDay;
|
||||
INTN TempMonth;
|
||||
INTN YearNumberOfTempMonth;
|
||||
INTN MonthRecord;
|
||||
|
||||
ASSERT ((Time->TimeZone >= -1440) && (Time->TimeZone <=1440));
|
||||
ASSERT ((LocalTimeZone >= -1440) && (LocalTimeZone <=1440));
|
||||
ASSERT ((Time->TimeZone >= -1440) && (Time->TimeZone <= 1440));
|
||||
ASSERT ((LocalTimeZone >= -1440) && (LocalTimeZone <= 1440));
|
||||
ASSERT ((Time->Month >= 1) && (Time->Month <= 12));
|
||||
|
||||
if(Time->TimeZone == LocalTimeZone) {
|
||||
if (Time->TimeZone == LocalTimeZone) {
|
||||
//
|
||||
//if the file timezone is equal to the local timezone, there is no need to adjust the file time.
|
||||
// if the file timezone is equal to the local timezone, there is no need to adjust the file time.
|
||||
//
|
||||
return;
|
||||
}
|
||||
|
||||
if((Time->Year % 4 == 0 && Time->Year / 100 != 0)||(Time->Year % 400 == 0)) {
|
||||
if (((Time->Year % 4 == 0) && (Time->Year / 100 != 0)) || (Time->Year % 400 == 0)) {
|
||||
//
|
||||
// Day in February of leap year is 29.
|
||||
//
|
||||
@ -363,21 +366,23 @@ FileTimeToLocalTime (
|
||||
// TempHour will be used to calculate Time->Hour
|
||||
//
|
||||
HourNumberOfTempMinute = TempMinute / 60;
|
||||
if(TempMinute < 0) {
|
||||
HourNumberOfTempMinute --;
|
||||
if (TempMinute < 0) {
|
||||
HourNumberOfTempMinute--;
|
||||
}
|
||||
TempHour = Time->Hour + HourNumberOfTempMinute;
|
||||
|
||||
TempHour = Time->Hour + HourNumberOfTempMinute;
|
||||
Time->Minute = (UINT8)(TempMinute - 60 * HourNumberOfTempMinute);
|
||||
|
||||
//
|
||||
// Calculate Time->Hour
|
||||
// TempDay will be used to calculate Time->Day
|
||||
//
|
||||
DayNumberOfTempHour = TempHour / 24 ;
|
||||
if(TempHour < 0){
|
||||
DayNumberOfTempHour = TempHour / 24;
|
||||
if (TempHour < 0) {
|
||||
DayNumberOfTempHour--;
|
||||
}
|
||||
TempDay = Time->Day + DayNumberOfTempHour;
|
||||
|
||||
TempDay = Time->Day + DayNumberOfTempHour;
|
||||
Time->Hour = (UINT8)(TempHour - 24 * DayNumberOfTempHour);
|
||||
|
||||
//
|
||||
@ -385,11 +390,12 @@ FileTimeToLocalTime (
|
||||
// TempMonth will be used to calculate Time->Month
|
||||
//
|
||||
MonthNumberOfTempDay = (TempDay - 1) / (INTN)mDayOfMonth[Time->Month - 1];
|
||||
MonthRecord = (INTN)(Time->Month) ;
|
||||
if(TempDay - 1 < 0){
|
||||
MonthNumberOfTempDay -- ;
|
||||
MonthRecord -- ;
|
||||
MonthRecord = (INTN)(Time->Month);
|
||||
if (TempDay - 1 < 0) {
|
||||
MonthNumberOfTempDay--;
|
||||
MonthRecord--;
|
||||
}
|
||||
|
||||
TempMonth = Time->Month + MonthNumberOfTempDay;
|
||||
Time->Day = (UINT8)(TempDay - (INTN)mDayOfMonth[(MonthRecord - 1 + 12) % 12] * MonthNumberOfTempDay);
|
||||
|
||||
@ -397,11 +403,12 @@ FileTimeToLocalTime (
|
||||
// Calculate Time->Month, Time->Year
|
||||
//
|
||||
YearNumberOfTempMonth = (TempMonth - 1) / 12;
|
||||
if(TempMonth - 1 < 0){
|
||||
YearNumberOfTempMonth --;
|
||||
if (TempMonth - 1 < 0) {
|
||||
YearNumberOfTempMonth--;
|
||||
}
|
||||
|
||||
Time->Month = (UINT8)(TempMonth - 12 * (YearNumberOfTempMonth));
|
||||
Time->Year = (UINT16)(Time->Year + YearNumberOfTempMonth);
|
||||
Time->Year = (UINT16)(Time->Year + YearNumberOfTempMonth);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -423,30 +430,30 @@ FileTimeToLocalTime (
|
||||
@retval SHELL_SUCCESS the printing was sucessful.
|
||||
**/
|
||||
SHELL_STATUS
|
||||
PrintLsOutput(
|
||||
IN CONST BOOLEAN Rec,
|
||||
IN CONST UINT64 Attribs,
|
||||
IN CONST BOOLEAN Sfo,
|
||||
IN CONST CHAR16 *RootPath,
|
||||
IN CONST CHAR16 *SearchString,
|
||||
IN BOOLEAN *Found,
|
||||
IN CONST UINTN Count,
|
||||
IN CONST INT16 TimeZone,
|
||||
IN CONST BOOLEAN ListUnfiltered
|
||||
PrintLsOutput (
|
||||
IN CONST BOOLEAN Rec,
|
||||
IN CONST UINT64 Attribs,
|
||||
IN CONST BOOLEAN Sfo,
|
||||
IN CONST CHAR16 *RootPath,
|
||||
IN CONST CHAR16 *SearchString,
|
||||
IN BOOLEAN *Found,
|
||||
IN CONST UINTN Count,
|
||||
IN CONST INT16 TimeZone,
|
||||
IN CONST BOOLEAN ListUnfiltered
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_SHELL_FILE_INFO *ListHead;
|
||||
EFI_SHELL_FILE_INFO *Node;
|
||||
SHELL_STATUS ShellStatus;
|
||||
UINT64 FileCount;
|
||||
UINT64 DirCount;
|
||||
UINT64 FileSize;
|
||||
UINTN LongestPath;
|
||||
CHAR16 *CorrectedPath;
|
||||
BOOLEAN FoundOne;
|
||||
BOOLEAN HeaderPrinted;
|
||||
EFI_TIME LocalTime;
|
||||
EFI_STATUS Status;
|
||||
EFI_SHELL_FILE_INFO *ListHead;
|
||||
EFI_SHELL_FILE_INFO *Node;
|
||||
SHELL_STATUS ShellStatus;
|
||||
UINT64 FileCount;
|
||||
UINT64 DirCount;
|
||||
UINT64 FileSize;
|
||||
UINTN LongestPath;
|
||||
CHAR16 *CorrectedPath;
|
||||
BOOLEAN FoundOne;
|
||||
BOOLEAN HeaderPrinted;
|
||||
EFI_TIME LocalTime;
|
||||
|
||||
HeaderPrinted = FALSE;
|
||||
FileCount = 0;
|
||||
@ -463,30 +470,33 @@ PrintLsOutput(
|
||||
FoundOne = FALSE;
|
||||
}
|
||||
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, RootPath, 0);
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, RootPath, 0);
|
||||
if (CorrectedPath == NULL) {
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
if (CorrectedPath[StrLen(CorrectedPath)-1] != L'\\'
|
||||
&&CorrectedPath[StrLen(CorrectedPath)-1] != L'/') {
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"\\", 0);
|
||||
|
||||
if ( (CorrectedPath[StrLen (CorrectedPath)-1] != L'\\')
|
||||
&& (CorrectedPath[StrLen (CorrectedPath)-1] != L'/'))
|
||||
{
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, L"\\", 0);
|
||||
}
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, SearchString, 0);
|
||||
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, SearchString, 0);
|
||||
if (CorrectedPath == NULL) {
|
||||
return (SHELL_OUT_OF_RESOURCES);
|
||||
}
|
||||
|
||||
PathCleanUpDirectories(CorrectedPath);
|
||||
PathCleanUpDirectories (CorrectedPath);
|
||||
|
||||
Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
if (ListHead == NULL || IsListEmpty(&ListHead->Link)) {
|
||||
SHELL_FREE_NON_NULL(CorrectedPath);
|
||||
Status = ShellOpenFileMetaArg ((CHAR16 *)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
if ((ListHead == NULL) || IsListEmpty (&ListHead->Link)) {
|
||||
SHELL_FREE_NON_NULL (CorrectedPath);
|
||||
return (SHELL_SUCCESS);
|
||||
}
|
||||
|
||||
if (Sfo && Found == NULL) {
|
||||
PrintSfoVolumeInfoTableEntry(ListHead);
|
||||
if (Sfo && (Found == NULL)) {
|
||||
PrintSfoVolumeInfoTableEntry (ListHead);
|
||||
}
|
||||
|
||||
if (!Sfo) {
|
||||
@ -503,54 +513,64 @@ PrintLsOutput(
|
||||
);
|
||||
}
|
||||
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link), LongestPath = 0
|
||||
; !IsNull(&ListHead->Link, &Node->Link)
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)
|
||||
){
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&ListHead->Link), LongestPath = 0
|
||||
; !IsNull (&ListHead->Link, &Node->Link)
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode (&ListHead->Link, &Node->Link)
|
||||
)
|
||||
{
|
||||
if (ShellGetExecutionBreakFlag ()) {
|
||||
ShellStatus = SHELL_ABORTED;
|
||||
break;
|
||||
}
|
||||
ASSERT(Node != NULL);
|
||||
|
||||
ASSERT (Node != NULL);
|
||||
|
||||
//
|
||||
// Change the file time to local time.
|
||||
//
|
||||
Status = gRT->GetTime(&LocalTime, NULL);
|
||||
Status = gRT->GetTime (&LocalTime, NULL);
|
||||
if (!EFI_ERROR (Status) && (LocalTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE)) {
|
||||
if ((Node->Info->CreateTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE) &&
|
||||
(Node->Info->CreateTime.Month >= 1 && Node->Info->CreateTime.Month <= 12)) {
|
||||
((Node->Info->CreateTime.Month >= 1) && (Node->Info->CreateTime.Month <= 12)))
|
||||
{
|
||||
//
|
||||
// FileTimeToLocalTime () requires Month is in a valid range, other buffer out-of-band access happens.
|
||||
//
|
||||
FileTimeToLocalTime (&Node->Info->CreateTime, LocalTime.TimeZone);
|
||||
}
|
||||
|
||||
if ((Node->Info->LastAccessTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE) &&
|
||||
(Node->Info->LastAccessTime.Month >= 1 && Node->Info->LastAccessTime.Month <= 12)) {
|
||||
((Node->Info->LastAccessTime.Month >= 1) && (Node->Info->LastAccessTime.Month <= 12)))
|
||||
{
|
||||
FileTimeToLocalTime (&Node->Info->LastAccessTime, LocalTime.TimeZone);
|
||||
}
|
||||
|
||||
if ((Node->Info->ModificationTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE) &&
|
||||
(Node->Info->ModificationTime.Month >= 1 && Node->Info->ModificationTime.Month <= 12)) {
|
||||
((Node->Info->ModificationTime.Month >= 1) && (Node->Info->ModificationTime.Month <= 12)))
|
||||
{
|
||||
FileTimeToLocalTime (&Node->Info->ModificationTime, LocalTime.TimeZone);
|
||||
}
|
||||
}
|
||||
|
||||
if (LongestPath < StrSize(Node->FullName)) {
|
||||
LongestPath = StrSize(Node->FullName);
|
||||
if (LongestPath < StrSize (Node->FullName)) {
|
||||
LongestPath = StrSize (Node->FullName);
|
||||
}
|
||||
ASSERT(Node->Info != NULL);
|
||||
ASSERT((Node->Info->Attribute & EFI_FILE_VALID_ATTR) == Node->Info->Attribute);
|
||||
|
||||
ASSERT (Node->Info != NULL);
|
||||
ASSERT ((Node->Info->Attribute & EFI_FILE_VALID_ATTR) == Node->Info->Attribute);
|
||||
if (Attribs == 0) {
|
||||
//
|
||||
// NOT system & NOT hidden
|
||||
//
|
||||
if ( (Node->Info->Attribute & EFI_FILE_SYSTEM)
|
||||
|| (Node->Info->Attribute & EFI_FILE_HIDDEN)
|
||||
){
|
||||
if ( (Node->Info->Attribute & EFI_FILE_SYSTEM)
|
||||
|| (Node->Info->Attribute & EFI_FILE_HIDDEN)
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
} else if ((Attribs != EFI_FILE_VALID_ATTR) ||
|
||||
(Count == 5)) {
|
||||
(Count == 5))
|
||||
{
|
||||
//
|
||||
// Only matches the bits which "Attribs" contains, not
|
||||
// all files/directories with any of the bits.
|
||||
@ -558,47 +578,52 @@ PrintLsOutput(
|
||||
// specifying all bits (EX: -arhsda) and just specifying
|
||||
// -a (means display all files with any attribute).
|
||||
//
|
||||
if ( (Node->Info->Attribute & Attribs) != Attribs) {
|
||||
if ((Node->Info->Attribute & Attribs) != Attribs) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (!Sfo && !HeaderPrinted) {
|
||||
PathRemoveLastItem (CorrectedPath);
|
||||
PrintNonSfoHeader(CorrectedPath);
|
||||
PrintNonSfoHeader (CorrectedPath);
|
||||
}
|
||||
PrintFileInformation(Sfo, Node, &FileCount, &FileSize, &DirCount);
|
||||
FoundOne = TRUE;
|
||||
|
||||
PrintFileInformation (Sfo, Node, &FileCount, &FileSize, &DirCount);
|
||||
FoundOne = TRUE;
|
||||
HeaderPrinted = TRUE;
|
||||
}
|
||||
|
||||
if (!Sfo && ShellStatus != SHELL_ABORTED && HeaderPrinted) {
|
||||
PrintNonSfoFooter(FileCount, FileSize, DirCount);
|
||||
if (!Sfo && (ShellStatus != SHELL_ABORTED) && HeaderPrinted) {
|
||||
PrintNonSfoFooter (FileCount, FileSize, DirCount);
|
||||
}
|
||||
}
|
||||
|
||||
if (Rec && ShellStatus != SHELL_ABORTED) {
|
||||
if (Rec && (ShellStatus != SHELL_ABORTED)) {
|
||||
//
|
||||
// Re-Open all the files under the starting path for directories that didnt necessarily match our file filter
|
||||
//
|
||||
ShellCloseFileMetaArg(&ListHead);
|
||||
ShellCloseFileMetaArg (&ListHead);
|
||||
CorrectedPath[0] = CHAR_NULL;
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, RootPath, 0);
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, RootPath, 0);
|
||||
if (CorrectedPath == NULL) {
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
if (CorrectedPath[StrLen(CorrectedPath)-1] != L'\\'
|
||||
&&CorrectedPath[StrLen(CorrectedPath)-1] != L'/') {
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"\\", 0);
|
||||
}
|
||||
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"*", 0);
|
||||
Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
|
||||
|
||||
if (!EFI_ERROR(Status)) {
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)
|
||||
; !IsNull(&ListHead->Link, &Node->Link) && ShellStatus == SHELL_SUCCESS
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)
|
||||
){
|
||||
if ( (CorrectedPath[StrLen (CorrectedPath)-1] != L'\\')
|
||||
&& (CorrectedPath[StrLen (CorrectedPath)-1] != L'/'))
|
||||
{
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, L"\\", 0);
|
||||
}
|
||||
|
||||
CorrectedPath = StrnCatGrow (&CorrectedPath, &LongestPath, L"*", 0);
|
||||
Status = ShellOpenFileMetaArg ((CHAR16 *)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&ListHead->Link)
|
||||
; !IsNull (&ListHead->Link, &Node->Link) && ShellStatus == SHELL_SUCCESS
|
||||
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode (&ListHead->Link, &Node->Link)
|
||||
)
|
||||
{
|
||||
if (ShellGetExecutionBreakFlag ()) {
|
||||
ShellStatus = SHELL_ABORTED;
|
||||
break;
|
||||
@ -607,20 +632,22 @@ PrintLsOutput(
|
||||
//
|
||||
// recurse on any directory except the traversing ones...
|
||||
//
|
||||
if (((Node->Info->Attribute & EFI_FILE_DIRECTORY) == EFI_FILE_DIRECTORY)
|
||||
&& StrCmp(Node->FileName, L".") != 0
|
||||
&& StrCmp(Node->FileName, L"..") != 0
|
||||
){
|
||||
ShellStatus = PrintLsOutput(
|
||||
Rec,
|
||||
Attribs,
|
||||
Sfo,
|
||||
Node->FullName,
|
||||
SearchString,
|
||||
&FoundOne,
|
||||
Count,
|
||||
TimeZone,
|
||||
FALSE);
|
||||
if ( ((Node->Info->Attribute & EFI_FILE_DIRECTORY) == EFI_FILE_DIRECTORY)
|
||||
&& (StrCmp (Node->FileName, L".") != 0)
|
||||
&& (StrCmp (Node->FileName, L"..") != 0)
|
||||
)
|
||||
{
|
||||
ShellStatus = PrintLsOutput (
|
||||
Rec,
|
||||
Attribs,
|
||||
Sfo,
|
||||
Node->FullName,
|
||||
SearchString,
|
||||
&FoundOne,
|
||||
Count,
|
||||
TimeZone,
|
||||
FALSE
|
||||
);
|
||||
|
||||
//
|
||||
// Since it's running recursively, we have to break immediately when returned SHELL_ABORTED
|
||||
@ -633,10 +660,10 @@ PrintLsOutput(
|
||||
}
|
||||
}
|
||||
|
||||
SHELL_FREE_NON_NULL(CorrectedPath);
|
||||
ShellCloseFileMetaArg(&ListHead);
|
||||
SHELL_FREE_NON_NULL (CorrectedPath);
|
||||
ShellCloseFileMetaArg (&ListHead);
|
||||
|
||||
if (Found == NULL && !FoundOne) {
|
||||
if ((Found == NULL) && !FoundOne) {
|
||||
if (ListUnfiltered) {
|
||||
//
|
||||
// When running "ls" without any filtering request, avoid outputing
|
||||
@ -661,12 +688,12 @@ PrintLsOutput(
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM LsParamList[] = {
|
||||
{L"-r", TypeFlag},
|
||||
{L"-a", TypeStart},
|
||||
{L"-sfo", TypeFlag},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM LsParamList[] = {
|
||||
{ L"-r", TypeFlag },
|
||||
{ L"-a", TypeStart },
|
||||
{ L"-sfo", TypeFlag },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'ls' command.
|
||||
@ -696,62 +723,63 @@ ShellCommandRunLs (
|
||||
CHAR16 *SearchString;
|
||||
BOOLEAN ListUnfiltered;
|
||||
|
||||
Size = 0;
|
||||
FullPath = NULL;
|
||||
ProblemParam = NULL;
|
||||
Attribs = NULL;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
RequiredAttributes = 0;
|
||||
PathName = NULL;
|
||||
SearchString = NULL;
|
||||
CurDir = NULL;
|
||||
Count = 0;
|
||||
ListUnfiltered = FALSE;
|
||||
Size = 0;
|
||||
FullPath = NULL;
|
||||
ProblemParam = NULL;
|
||||
Attribs = NULL;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
RequiredAttributes = 0;
|
||||
PathName = NULL;
|
||||
SearchString = NULL;
|
||||
CurDir = NULL;
|
||||
Count = 0;
|
||||
ListUnfiltered = FALSE;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// Fix local copies of the protocol pointers
|
||||
//
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (LsParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"ls", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"ls", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// check for "-?"
|
||||
//
|
||||
if (ShellCommandLineGetFlag(Package, L"-?")) {
|
||||
ASSERT(FALSE);
|
||||
if (ShellCommandLineGetFlag (Package, L"-?")) {
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
|
||||
if (ShellCommandLineGetCount(Package) > 2) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"ls");
|
||||
if (ShellCommandLineGetCount (Package) > 2) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"ls");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
//
|
||||
// check for -a
|
||||
//
|
||||
if (ShellCommandLineGetFlag(Package, L"-a")) {
|
||||
for ( Attribs = ShellCommandLineGetValue(Package, L"-a")
|
||||
; Attribs != NULL && *Attribs != CHAR_NULL && ShellStatus == SHELL_SUCCESS
|
||||
; Attribs++
|
||||
){
|
||||
if (ShellCommandLineGetFlag (Package, L"-a")) {
|
||||
for ( Attribs = ShellCommandLineGetValue (Package, L"-a")
|
||||
; Attribs != NULL && *Attribs != CHAR_NULL && ShellStatus == SHELL_SUCCESS
|
||||
; Attribs++
|
||||
)
|
||||
{
|
||||
switch (*Attribs) {
|
||||
case L'a':
|
||||
case L'A':
|
||||
@ -779,11 +807,12 @@ ShellCommandRunLs (
|
||||
Count++;
|
||||
continue;
|
||||
default:
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ATTRIBUTE), gShellLevel2HiiHandle, L"ls", ShellCommandLineGetValue(Package, L"-a"));
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ATTRIBUTE), gShellLevel2HiiHandle, L"ls", ShellCommandLineGetValue (Package, L"-a"));
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
break;
|
||||
} // switch
|
||||
} // for loop
|
||||
|
||||
//
|
||||
// if nothing is specified all are specified
|
||||
//
|
||||
@ -791,103 +820,109 @@ ShellCommandRunLs (
|
||||
RequiredAttributes = EFI_FILE_VALID_ATTR;
|
||||
}
|
||||
} // if -a present
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
PathName = ShellCommandLineGetRawValue(Package, 1);
|
||||
PathName = ShellCommandLineGetRawValue (Package, 1);
|
||||
if (PathName == NULL) {
|
||||
//
|
||||
// Nothing specified... must start from current directory
|
||||
//
|
||||
CurDir = gEfiShellProtocol->GetCurDir(NULL);
|
||||
CurDir = gEfiShellProtocol->GetCurDir (NULL);
|
||||
if (CurDir == NULL) {
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");
|
||||
}
|
||||
|
||||
ListUnfiltered = TRUE;
|
||||
//
|
||||
// Copy to the 2 strings for starting path and file search string
|
||||
//
|
||||
ASSERT(SearchString == NULL);
|
||||
ASSERT(FullPath == NULL);
|
||||
StrnCatGrow(&SearchString, NULL, L"*", 0);
|
||||
StrnCatGrow(&FullPath, NULL, CurDir, 0);
|
||||
Size = FullPath != NULL? StrSize(FullPath) : 0;
|
||||
StrnCatGrow(&FullPath, &Size, L"\\", 0);
|
||||
ASSERT (SearchString == NULL);
|
||||
ASSERT (FullPath == NULL);
|
||||
StrnCatGrow (&SearchString, NULL, L"*", 0);
|
||||
StrnCatGrow (&FullPath, NULL, CurDir, 0);
|
||||
Size = FullPath != NULL ? StrSize (FullPath) : 0;
|
||||
StrnCatGrow (&FullPath, &Size, L"\\", 0);
|
||||
} else {
|
||||
if (StrStr(PathName, L":") == NULL && gEfiShellProtocol->GetCurDir(NULL) == NULL) {
|
||||
if ((StrStr (PathName, L":") == NULL) && (gEfiShellProtocol->GetCurDir (NULL) == NULL)) {
|
||||
//
|
||||
// If we got something and it doesnt have a fully qualified path, then we needed to have a CWD.
|
||||
//
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"ls");
|
||||
} else {
|
||||
//
|
||||
// We got a valid fully qualified path or we have a CWD
|
||||
//
|
||||
ASSERT((FullPath == NULL && Size == 0) || (FullPath != NULL));
|
||||
if (StrStr(PathName, L":") == NULL) {
|
||||
StrnCatGrow(&FullPath, &Size, gEfiShellProtocol->GetCurDir(NULL), 0);
|
||||
ASSERT ((FullPath == NULL && Size == 0) || (FullPath != NULL));
|
||||
if (StrStr (PathName, L":") == NULL) {
|
||||
StrnCatGrow (&FullPath, &Size, gEfiShellProtocol->GetCurDir (NULL), 0);
|
||||
if (FullPath == NULL) {
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
Size = FullPath != NULL? StrSize(FullPath) : 0;
|
||||
StrnCatGrow(&FullPath, &Size, L"\\", 0);
|
||||
}
|
||||
StrnCatGrow(&FullPath, &Size, PathName, 0);
|
||||
if (FullPath == NULL) {
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
|
||||
Size = FullPath != NULL ? StrSize (FullPath) : 0;
|
||||
StrnCatGrow (&FullPath, &Size, L"\\", 0);
|
||||
}
|
||||
|
||||
if (ShellIsDirectory(PathName) == EFI_SUCCESS) {
|
||||
StrnCatGrow (&FullPath, &Size, PathName, 0);
|
||||
if (FullPath == NULL) {
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
if (ShellIsDirectory (PathName) == EFI_SUCCESS) {
|
||||
//
|
||||
// is listing ends with a directory, then we list all files in that directory
|
||||
//
|
||||
ListUnfiltered = TRUE;
|
||||
StrnCatGrow(&SearchString, NULL, L"*", 0);
|
||||
StrnCatGrow (&SearchString, NULL, L"*", 0);
|
||||
} else {
|
||||
//
|
||||
// must split off the search part that applies to files from the end of the directory part
|
||||
//
|
||||
StrnCatGrow(&SearchString, NULL, FullPath, 0);
|
||||
StrnCatGrow (&SearchString, NULL, FullPath, 0);
|
||||
if (SearchString == NULL) {
|
||||
FreePool (FullPath);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
PathRemoveLastItem (FullPath);
|
||||
CopyMem (SearchString, SearchString + StrLen (FullPath), StrSize (SearchString + StrLen (FullPath)));
|
||||
}
|
||||
}
|
||||
}
|
||||
Status = gRT->GetTime(&TheTime, NULL);
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"ls", L"gRT->GetTime", Status);
|
||||
|
||||
Status = gRT->GetTime (&TheTime, NULL);
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"ls", L"gRT->GetTime", Status);
|
||||
TheTime.TimeZone = EFI_UNSPECIFIED_TIMEZONE;
|
||||
}
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
ShellStatus = PrintLsOutput(
|
||||
ShellCommandLineGetFlag(Package, L"-r"),
|
||||
RequiredAttributes,
|
||||
ShellCommandLineGetFlag(Package, L"-sfo"),
|
||||
FullPath,
|
||||
SearchString,
|
||||
NULL,
|
||||
Count,
|
||||
TheTime.TimeZone,
|
||||
ListUnfiltered
|
||||
);
|
||||
ShellStatus = PrintLsOutput (
|
||||
ShellCommandLineGetFlag (Package, L"-r"),
|
||||
RequiredAttributes,
|
||||
ShellCommandLineGetFlag (Package, L"-sfo"),
|
||||
FullPath,
|
||||
SearchString,
|
||||
NULL,
|
||||
Count,
|
||||
TheTime.TimeZone,
|
||||
ListUnfiltered
|
||||
);
|
||||
if (ShellStatus == SHELL_NOT_FOUND) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
} else if (ShellStatus == SHELL_INVALID_PARAMETER) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
} else if (ShellStatus == SHELL_ABORTED) {
|
||||
//
|
||||
// Ignore aborting.
|
||||
//
|
||||
} else if (ShellStatus != SHELL_SUCCESS) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"ls", FullPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -897,8 +932,8 @@ ShellCommandRunLs (
|
||||
//
|
||||
// Free memory allocated
|
||||
//
|
||||
SHELL_FREE_NON_NULL(SearchString);
|
||||
SHELL_FREE_NON_NULL(FullPath);
|
||||
SHELL_FREE_NON_NULL (SearchString);
|
||||
SHELL_FREE_NON_NULL (FullPath);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
|
||||
return (ShellStatus);
|
||||
|
||||
Reference in New Issue
Block a user