X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FLs.c;h=63af5eab18884d216110df720440073607260719;hp=440d2450f5c068ef537564493fb66ab93f8841fe;hb=3a8406adb367e8b0d2f107adfc6c141b953d938d;hpb=9ea69f8a05b808b4bab81b608436a02e2f2fba09
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 440d2450f5..63af5eab18 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -1,7 +1,8 @@
/** @file
Main file for ls shell level 2 function.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -16,180 +17,265 @@
#include
/**
- print out the list of files and directories from the LS command
+ print out the standard format output volume entry.
- @param[in] Rec TRUE to automatically recurse into each found directory
- FALSE to only list the specified directory.
- @param[in] Attribs List of required Attribute for display.
- If 0 then all non-system and non-hidden files will be printed.
- @param[in] Sfo TRUE to use Standard Format Output, FALSE otherwise
- @param[in] Path String with starting path.
- @param[in] First TRUE for the original and FALSE for any recursion spawned instances.
- @param[in] Count The count of bits enabled in Attribs.
- @param[in] TimeZone The current time zone offset.
-
- @retval SHELL_SUCCESS the printing was sucessful.
+ @param[in] TheList a list of files from the volume.
**/
-SHELL_STATUS
+EFI_STATUS
EFIAPI
-PrintLsOutput(
- IN CONST BOOLEAN Rec,
- IN CONST UINT64 Attribs,
- IN CONST BOOLEAN Sfo,
- IN CONST CHAR16 *Path,
- IN CONST BOOLEAN First,
- IN CONST UINTN Count,
- IN CONST INT16 TimeZone
+PrintSfoVolumeInfoTableEntry(
+ IN CONST EFI_SHELL_FILE_INFO *TheList
)
{
EFI_STATUS Status;
- EFI_SHELL_FILE_INFO *ListHead;
EFI_SHELL_FILE_INFO *Node;
- SHELL_STATUS ShellStatus;
- UINT64 FileCount;
- UINT64 DirCount;
- UINT64 FileSize;
CHAR16 *DirectoryName;
- UINTN LongestPath;
EFI_FILE_SYSTEM_INFO *SysInfo;
UINTN SysInfoSize;
SHELL_FILE_HANDLE ShellFileHandle;
- CHAR16 *CorrectedPath;
EFI_FILE_PROTOCOL *EfiFpHandle;
- FileCount = 0;
- DirCount = 0;
- FileSize = 0;
- ListHead = NULL;
- ShellStatus = SHELL_SUCCESS;
- LongestPath = 0;
- CorrectedPath = NULL;
+ //
+ // 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)
+ );
- CorrectedPath = StrnCatGrow(&CorrectedPath, NULL, Path, 0);
- ASSERT(CorrectedPath != NULL);
- ShellCommandCleanPath(CorrectedPath);
+ if (Node->Handle == NULL) {
+ DirectoryName = GetFullyQualifiedPath(((EFI_SHELL_FILE_INFO *)GetFirstNode(&TheList->Link))->FullName);
- Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);
- if (EFI_ERROR(Status)) {
- return (SHELL_DEVICE_ERROR);
- }
- if (ListHead == NULL || IsListEmpty(&ListHead->Link)) {
//
- // On the first one only we expect to find something...
- // do we find the . and .. directories otherwise?
+ // We need to open something up to get system information
//
- if (First) {
- return (SHELL_NOT_FOUND);
- }
- return (SHELL_SUCCESS);
- }
+ Status = gEfiShellProtocol->OpenFileByName(
+ DirectoryName,
+ &ShellFileHandle,
+ EFI_FILE_MODE_READ
+ );
+
+ ASSERT_EFI_ERROR(Status);
+ FreePool(DirectoryName);
- if (Sfo && First) {
//
- // Get the first valid handle (directories)
+ // Get the Volume Info from ShellFileHandle
//
- for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)
- ; !IsNull(&ListHead->Link, &Node->Link) && Node->Handle == NULL
- ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)
- );
-
- if (Node->Handle == NULL) {
- DirectoryName = GetFullyQualifiedPath(((EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link))->FullName);
-
- //
- // We need to open something up to get system information
- //
- Status = gEfiShellProtocol->OpenFileByName(
- DirectoryName,
- &ShellFileHandle,
- EFI_FILE_MODE_READ);
-
- ASSERT_EFI_ERROR(Status);
- FreePool(DirectoryName);
-
- //
- // Get the Volume Info from ShellFileHandle
- //
- SysInfo = NULL;
- SysInfoSize = 0;
- EfiFpHandle = ConvertShellHandleToEfiFileProtocol(ShellFileHandle);
+ SysInfo = NULL;
+ SysInfoSize = 0;
+ 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);
-
- if (Status == EFI_BUFFER_TOO_SMALL) {
- SysInfo = AllocateZeroPool(SysInfoSize);
- Status = EfiFpHandle->GetInfo(
- EfiFpHandle,
- &gEfiFileSystemInfoGuid,
- &SysInfoSize,
- SysInfo);
- }
+ SysInfo
+ );
+ }
- ASSERT_EFI_ERROR(Status);
+ ASSERT_EFI_ERROR(Status);
- gEfiShellProtocol->CloseFile(ShellFileHandle);
- } else {
- //
- // Get the Volume Info from Node->Handle
- //
- SysInfo = NULL;
- SysInfoSize = 0;
- EfiFpHandle = ConvertShellHandleToEfiFileProtocol(Node->Handle);
+ gEfiShellProtocol->CloseFile(ShellFileHandle);
+ } else {
+ //
+ // Get the Volume Info from Node->Handle
+ //
+ SysInfo = NULL;
+ SysInfoSize = 0;
+ 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);
-
- if (Status == EFI_BUFFER_TOO_SMALL) {
- SysInfo = AllocateZeroPool(SysInfoSize);
- Status = EfiFpHandle->GetInfo(
- EfiFpHandle,
- &gEfiFileSystemInfoGuid,
- &SysInfoSize,
- SysInfo);
- }
-
- ASSERT_EFI_ERROR(Status);
+ SysInfo
+ );
}
+ ASSERT_EFI_ERROR(Status);
+ }
+
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_GEN_SFO_HEADER),
+ gShellLevel2HiiHandle,
+ L"ls"
+ );
+ //
+ // print VolumeInfo table
+ //
+ ASSERT(SysInfo != NULL);
+ ShellPrintHiiEx (
+ 0,
+ gST->ConOut->Mode->CursorRow,
+ NULL,
+ STRING_TOKEN (STR_LS_SFO_VOLINFO),
+ gShellLevel2HiiHandle,
+ SysInfo->VolumeLabel,
+ SysInfo->VolumeSize,
+ SysInfo->ReadOnly?L"TRUE":L"FALSE",
+ SysInfo->FreeSpace,
+ SysInfo->BlockSize
+ );
+
+ SHELL_FREE_NON_NULL(SysInfo);
+
+ return (Status);
+}
+
+/**
+ print out the info on a single file.
+
+ @param[in] Sfo TRUE if in SFO, false otherwise.
+ @param[in] TheNode the EFI_SHELL_FILE_INFO node to print out information on.
+ @param[in] Files incremented if a file is printed.
+ @param[in] Size incremented by file size.
+ @param[in] Dirs incremented if a directory is printed.
+
+**/
+VOID
+EFIAPI
+PrintFileInformation(
+ IN CONST BOOLEAN Sfo,
+ IN CONST EFI_SHELL_FILE_INFO *TheNode,
+ IN UINT64 *Files,
+ IN UINT64 *Size,
+ IN UINT64 *Dirs
+ )
+{
+ ASSERT(Files != NULL);
+ ASSERT(Size != NULL);
+ ASSERT(Dirs != NULL);
+ ASSERT(TheNode != NULL);
+
+ if (Sfo) {
+ //
+ // Print the FileInfo Table
+ //
ShellPrintHiiEx (
- -1,
- -1,
+ 0,
+ gST->ConOut->Mode->CursorRow,
NULL,
- STRING_TOKEN (STR_GEN_SFO_HEADER),
+ STRING_TOKEN (STR_LS_SFO_FILEINFO),
gShellLevel2HiiHandle,
- L"ls");
+ 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->CreateTime.Hour,
+ TheNode->Info->CreateTime.Minute,
+ TheNode->Info->CreateTime.Second,
+ TheNode->Info->CreateTime.Day,
+ TheNode->Info->CreateTime.Month,
+ TheNode->Info->CreateTime.Year,
+ TheNode->Info->LastAccessTime.Hour,
+ TheNode->Info->LastAccessTime.Minute,
+ TheNode->Info->LastAccessTime.Second,
+ TheNode->Info->LastAccessTime.Day,
+ TheNode->Info->LastAccessTime.Month,
+ TheNode->Info->LastAccessTime.Year,
+ TheNode->Info->ModificationTime.Hour,
+ TheNode->Info->ModificationTime.Minute,
+ TheNode->Info->ModificationTime.Second,
+ TheNode->Info->ModificationTime.Day,
+ TheNode->Info->ModificationTime.Month,
+ TheNode->Info->ModificationTime.Year
+ );
+ } else {
//
- // print VolumeInfo table
+ // print this one out...
+ // first print the universal start, next print the type specific name format, last print the CRLF
//
- ASSERT(SysInfo != NULL);
ShellPrintHiiEx (
- 0,
- gST->ConOut->Mode->CursorRow,
+ -1,
+ -1,
NULL,
- STRING_TOKEN (STR_LS_SFO_VOLINFO),
+ STRING_TOKEN (STR_LS_LINE_START_ALL),
gShellLevel2HiiHandle,
- SysInfo->VolumeLabel,
- SysInfo->VolumeSize,
- SysInfo->ReadOnly?L"TRUE":L"FALSE",
- SysInfo->FreeSpace,
- SysInfo->BlockSize
- );
- if (SysInfo != NULL) {
- FreePool(SysInfo);
+ &TheNode->Info->ModificationTime,
+ (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"":L"",
+ (TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L'r':L' ',
+ TheNode->Info->FileSize
+ );
+ if (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) {
+ (*Dirs)++;
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_LS_LINE_END_DIR),
+ gShellLevel2HiiHandle,
+ TheNode->FileName
+ );
+ } 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)
+ ){
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_LS_LINE_END_EXE),
+ gShellLevel2HiiHandle,
+ TheNode->FileName
+ );
+ } else {
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_LS_LINE_END_FILE),
+ gShellLevel2HiiHandle,
+ TheNode->FileName
+ );
+ }
}
}
+}
- if (!Sfo) {
- //
- // get directory name from path...
- //
- DirectoryName = GetFullyQualifiedPath(CorrectedPath);
+/**
+ print out the header when not using standard format output.
+
+ @param[in] Path String with starting path.
+**/
+VOID
+EFIAPI
+PrintNonSfoHeader(
+ IN CONST CHAR16 *Path
+ )
+{
+ CHAR16 *DirectoryName;
+ //
+ // get directory name from path...
+ //
+ DirectoryName = GetFullyQualifiedPath(Path);
+
+ if (DirectoryName != NULL) {
//
// print header
//
@@ -200,163 +286,194 @@ PrintLsOutput(
STRING_TOKEN (STR_LS_HEADER_LINE1),
gShellLevel2HiiHandle,
DirectoryName
- );
- FreePool(DirectoryName);
+ );
+
+ SHELL_FREE_NON_NULL(DirectoryName);
+ }
+}
+
+/**
+ print out the footer when not using standard format output.
+
+ @param[in] Files The number of files.
+ @param[in] Size The size of files in bytes.
+ @param[in] Dirs The number of directories.
+**/
+VOID
+EFIAPI
+PrintNonSfoFooter(
+ IN UINT64 Files,
+ IN UINT64 Size,
+ IN UINT64 Dirs
+ )
+{
+ //
+ // print footer
+ //
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_LS_FOOTER_LINE),
+ gShellLevel2HiiHandle,
+ Files,
+ Size,
+ Dirs
+ );
+}
+
+/**
+ print out the list of files and directories from the LS command
+
+ @param[in] Rec TRUE to automatically recurse into each found directory
+ FALSE to only list the specified directory.
+ @param[in] Attribs List of required Attribute for display.
+ If 0 then all non-system and non-hidden files will be printed.
+ @param[in] Sfo TRUE to use Standard Format Output, FALSE otherwise
+ @param[in] RootPath String with starting path to search in.
+ @param[in] SearchString String with search string.
+ @param[in] Found Set to TRUE, if anyone were found.
+ @param[in] Count The count of bits enabled in Attribs.
+ @param[in] TimeZone The current time zone offset.
+
+ @retval SHELL_SUCCESS the printing was sucessful.
+**/
+SHELL_STATUS
+EFIAPI
+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
+ )
+{
+ 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;
+
+ HeaderPrinted = FALSE;
+ FileCount = 0;
+ DirCount = 0;
+ FileSize = 0;
+ ListHead = NULL;
+ ShellStatus = SHELL_SUCCESS;
+ LongestPath = 0;
+ CorrectedPath = NULL;
+
+ if (Found != NULL) {
+ FoundOne = *Found;
+ } else {
+ FoundOne = FALSE;
}
- for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)
- ; !IsNull(&ListHead->Link, &Node->Link)
- ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)
- ){
- ASSERT(Node != NULL);
- if (LongestPath < StrSize(Node->FullName)) {
- LongestPath = StrSize(Node->FullName);
+
+ 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, SearchString, 0);
+ if (CorrectedPath == NULL) {
+ return (SHELL_OUT_OF_RESOURCES);
+ }
+
+ 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);
+ return (SHELL_SUCCESS);
}
- 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)
- ){
- continue;
+
+ if (Sfo && Found == NULL) {
+ PrintSfoVolumeInfoTableEntry(ListHead);
+ }
+
+ 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)
+ ){
+ ASSERT(Node != NULL);
+ if (LongestPath < StrSize(Node->FullName)) {
+ LongestPath = StrSize(Node->FullName);
}
- } else if (Attribs != EFI_FILE_VALID_ATTR) {
- if (Count == 1) {
+ ASSERT(Node->Info != NULL);
+ ASSERT((Node->Info->Attribute & EFI_FILE_VALID_ATTR) == Node->Info->Attribute);
+ if (Attribs == 0) {
//
- // the bit must match
+ // NOT system & NOT hidden
//
- if ( (Node->Info->Attribute & Attribs) != Attribs) {
+ if ( (Node->Info->Attribute & EFI_FILE_SYSTEM)
+ || (Node->Info->Attribute & EFI_FILE_HIDDEN)
+ ){
continue;
}
- } else {
+ } else if ((Attribs != EFI_FILE_VALID_ATTR) ||
+ (Count == 5)) {
//
- // exact match on all bits
+ // Only matches the bits which "Attribs" contains, not
+ // all files/directories with any of the bits.
+ // Count == 5 is used to tell the difference between a user
+ // specifying all bits (EX: -arhsda) and just specifying
+ // -a (means display all files with any attribute).
//
- if ( Node->Info->Attribute != Attribs) {
+ if ( (Node->Info->Attribute & Attribs) != Attribs) {
continue;
}
}
- }
- if (Sfo) {
- //
- // Print the FileInfo Table
- //
- ShellPrintHiiEx (
- 0,
- gST->ConOut->Mode->CursorRow,
- NULL,
- STRING_TOKEN (STR_LS_SFO_FILEINFO),
- gShellLevel2HiiHandle,
- Node->FullName,
- Node->Info->FileSize,
- Node->Info->PhysicalSize,
- (Node->Info->Attribute & EFI_FILE_ARCHIVE) != 0?L"a":L"",
- (Node->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"d":L"",
- (Node->Info->Attribute & EFI_FILE_HIDDEN) != 0?L"h":L"",
- (Node->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L"r":L"",
- (Node->Info->Attribute & EFI_FILE_SYSTEM) != 0?L"s":L"",
- Node->Info->CreateTime.Hour,
- Node->Info->CreateTime.Minute,
- Node->Info->CreateTime.Second,
- Node->Info->CreateTime.Day,
- Node->Info->CreateTime.Month,
- Node->Info->CreateTime.Year,
- Node->Info->LastAccessTime.Hour,
- Node->Info->LastAccessTime.Minute,
- Node->Info->LastAccessTime.Second,
- Node->Info->LastAccessTime.Day,
- Node->Info->LastAccessTime.Month,
- Node->Info->LastAccessTime.Year,
- Node->Info->ModificationTime.Hour,
- Node->Info->ModificationTime.Minute,
- Node->Info->ModificationTime.Second,
- Node->Info->ModificationTime.Day,
- Node->Info->ModificationTime.Month,
- Node->Info->ModificationTime.Year
- );
- } else {
- //
- // print this one out...
- // first print the universal start, next print the type specific name format, last print the CRLF
- //
- ShellPrintHiiEx (
- -1,
- -1,
- NULL,
- STRING_TOKEN (STR_LS_LINE_START_ALL),
- gShellLevel2HiiHandle,
- &Node->Info->ModificationTime,
- (Node->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"":L"",
- (Node->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L'r':L' ',
- Node->Info->FileSize
- );
- if (Node->Info->Attribute & EFI_FILE_DIRECTORY) {
- DirCount++;
- ShellPrintHiiEx (
- -1,
- -1,
- NULL,
- STRING_TOKEN (STR_LS_LINE_END_DIR),
- gShellLevel2HiiHandle,
- Node->FileName
- );
- } else {
- FileCount++;
- FileSize += Node->Info->FileSize;
- if ( (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".nsh", (CHAR16*)&(Node->FileName[StrLen (Node->FileName) - 4])) == 0)
- || (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".efi", (CHAR16*)&(Node->FileName[StrLen (Node->FileName) - 4])) == 0)
- ){
- ShellPrintHiiEx (
- -1,
- -1,
- NULL,
- STRING_TOKEN (STR_LS_LINE_END_EXE),
- gShellLevel2HiiHandle,
- Node->FileName
- );
- } else {
- ShellPrintHiiEx (
- -1,
- -1,
- NULL,
- STRING_TOKEN (STR_LS_LINE_END_FILE),
- gShellLevel2HiiHandle,
- Node->FileName
- );
- }
+ if (!Sfo && HeaderPrinted == FALSE) {
+ PrintNonSfoHeader(CorrectedPath);
}
+ PrintFileInformation(Sfo, Node, &FileCount, &FileSize, &DirCount);
+ FoundOne = TRUE;
+ HeaderPrinted = TRUE;
+ }
+
+ if (!Sfo) {
+ PrintNonSfoFooter(FileCount, FileSize, DirCount);
}
}
- if (!Sfo) {
+ if (Rec) {
//
- // print footer
+ // Re-Open all the files under the starting path for directories that didnt necessarily match our file filter
//
- ShellPrintHiiEx (
- -1,
- -1,
- NULL,
- STRING_TOKEN (STR_LS_FOOTER_LINE),
- gShellLevel2HiiHandle,
- FileCount,
- FileSize,
- DirCount
- );
- }
-
- if (Rec){
- DirectoryName = AllocatePool(LongestPath + 2*sizeof(CHAR16));
- if (DirectoryName == NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);
- ShellStatus = SHELL_OUT_OF_RESOURCES;
- } else {
+ ShellCloseFileMetaArg(&ListHead);
+ CorrectedPath[0] = CHAR_NULL;
+ CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, RootPath, 0);
+ 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)
+ ; !IsNull(&ListHead->Link, &Node->Link) && ShellStatus == SHELL_SUCCESS
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)
){
+ if (ShellGetExecutionBreakFlag ()) {
+ ShellStatus = SHELL_ABORTED;
+ break;
+ }
+
//
// recurse on any directory except the traversing ones...
//
@@ -364,25 +481,31 @@ PrintLsOutput(
&& StrCmp(Node->FileName, L".") != 0
&& StrCmp(Node->FileName, L"..") != 0
){
- StrCpy(DirectoryName, Node->FullName);
- StrCat(DirectoryName, L"\\*");
- PrintLsOutput(
+ ShellStatus = PrintLsOutput(
Rec,
Attribs,
Sfo,
- DirectoryName,
- FALSE,
+ Node->FullName,
+ SearchString,
+ &FoundOne,
Count,
TimeZone);
}
}
- FreePool(DirectoryName);
}
}
- FreePool(CorrectedPath);
+ SHELL_FREE_NON_NULL(CorrectedPath);
ShellCloseFileMetaArg(&ListHead);
- FreePool(ListHead);
+
+ if (Found == NULL && FoundOne == FALSE) {
+ return (SHELL_NOT_FOUND);
+ }
+
+ if (Found != NULL) {
+ *Found = FoundOne;
+ }
+
return (ShellStatus);
}
@@ -417,8 +540,8 @@ ShellCommandRunLs (
UINTN Count;
CHAR16 *FullPath;
UINTN Size;
- EFI_TIME theTime;
- BOOLEAN SfoMode;
+ EFI_TIME TheTime;
+ CHAR16 *SearchString;
Size = 0;
FullPath = NULL;
@@ -427,6 +550,7 @@ ShellCommandRunLs (
ShellStatus = SHELL_SUCCESS;
RequiredAttributes = 0;
PathName = NULL;
+ SearchString = NULL;
CurDir = NULL;
Count = 0;
@@ -516,39 +640,87 @@ ShellCommandRunLs (
if (ShellStatus == SHELL_SUCCESS) {
PathName = ShellCommandLineGetRawValue(Package, 1);
if (PathName == NULL) {
+ //
+ // Nothing specified... must start from current directory
+ //
CurDir = gEfiShellProtocol->GetCurDir(NULL);
if (CurDir == NULL) {
ShellStatus = SHELL_NOT_FOUND;
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);
}
- }
- if (PathName != NULL) {
- ASSERT((FullPath == NULL && Size == 0) || (FullPath != NULL));
- StrnCatGrow(&FullPath, &Size, PathName, 0);
- if (ShellIsDirectory(PathName) == EFI_SUCCESS) {
- StrnCatGrow(&FullPath, &Size, L"\\*", 0);
- }
- } else {
+ //
+ // Copy to the 2 strings for starting path and file search string
+ //
+ ASSERT(SearchString == NULL);
ASSERT(FullPath == NULL);
- StrnCatGrow(&FullPath, NULL, L"*", 0);
+ StrnCatGrow(&SearchString, NULL, L"*", 0);
+ StrnCatGrow(&FullPath, NULL, CurDir, 0);
+ } else {
+ 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);
+ } 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);
+ if (FullPath == NULL) {
+ ShellCommandLineFreeVarList (Package);
+ return SHELL_OUT_OF_RESOURCES;
+ }
+ }
+ 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
+ //
+ StrnCatGrow(&SearchString, NULL, L"*", 0);
+ } else {
+ //
+ // must split off the search part that applies to files from the end of the directory part
+ //
+ for (StrnCatGrow(&SearchString, NULL, PathName, 0)
+ ; SearchString != NULL && StrStr(SearchString, L"\\") != NULL
+ ; CopyMem(SearchString, StrStr(SearchString, L"\\") + 1, 1 + StrSize(StrStr(SearchString, L"\\") + 1))) ;
+ FullPath[StrLen(FullPath) - StrLen(SearchString)] = CHAR_NULL;
+ }
+ }
}
- Status = gRT->GetTime(&theTime, NULL);
- ASSERT_EFI_ERROR(Status);
- SfoMode = ShellCommandLineGetFlag(Package, L"-sfo");
+ Status = gRT->GetTime(&TheTime, NULL);
+ if (EFI_ERROR(Status)) {
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"gRT->GetTime", Status);
+ TheTime.TimeZone = EFI_UNSPECIFIED_TIMEZONE;
+ }
+
if (ShellStatus == SHELL_SUCCESS) {
ShellStatus = PrintLsOutput(
ShellCommandLineGetFlag(Package, L"-r"),
RequiredAttributes,
- SfoMode,
+ ShellCommandLineGetFlag(Package, L"-sfo"),
FullPath,
- TRUE,
+ SearchString,
+ NULL,
Count,
- (INT16)(theTime.TimeZone==2047?0:theTime.TimeZone)
+ (INT16)(TheTime.TimeZone==EFI_UNSPECIFIED_TIMEZONE?0:TheTime.TimeZone)
);
if (ShellStatus == SHELL_NOT_FOUND) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_FILES), gShellLevel2HiiHandle);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle);
} else if (ShellStatus == SHELL_INVALID_PARAMETER) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle);
+ } else if (ShellStatus == SHELL_ABORTED) {
+ //
+ // Ignore aborting.
+ //
} else if (ShellStatus != SHELL_SUCCESS) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle);
}
@@ -557,12 +729,11 @@ ShellCommandRunLs (
}
}
- if (FullPath != NULL) {
- FreePool(FullPath);
- }
//
- // free the command line package
+ // Free memory allocated
//
+ SHELL_FREE_NON_NULL(SearchString);
+ SHELL_FREE_NON_NULL(FullPath);
ShellCommandLineFreeVarList (Package);
return (ShellStatus);