/** @file\r
Main file for ls shell level 2 function.\r
\r
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2013 Hewlett-Packard Development Company, L.P.\r
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
#include "UefiShellLevel2CommandsLib.h"\r
#include <Guid/FileSystemInfo.h>\r
\r
+/**\r
+ print out the standard format output volume entry.\r
+\r
+ @param[in] TheList a list of files from the volume.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+PrintSfoVolumeInfoTableEntry(\r
+ IN CONST EFI_SHELL_FILE_INFO *TheList\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EFI_SHELL_FILE_INFO *Node;\r
+ CHAR16 *DirectoryName;\r
+ EFI_FILE_SYSTEM_INFO *SysInfo;\r
+ UINTN SysInfoSize;\r
+ SHELL_FILE_HANDLE ShellFileHandle;\r
+ EFI_FILE_PROTOCOL *EfiFpHandle;\r
+\r
+ //\r
+ // Get the first valid handle (directories)\r
+ //\r
+ for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&TheList->Link)\r
+ ; !IsNull(&TheList->Link, &Node->Link) && Node->Handle == NULL\r
+ ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&TheList->Link, &Node->Link)\r
+ );\r
+\r
+ if (Node->Handle == NULL) {\r
+ DirectoryName = GetFullyQualifiedPath(((EFI_SHELL_FILE_INFO *)GetFirstNode(&TheList->Link))->FullName);\r
+\r
+ //\r
+ // We need to open something up to get system information\r
+ //\r
+ Status = gEfiShellProtocol->OpenFileByName(\r
+ DirectoryName,\r
+ &ShellFileHandle,\r
+ EFI_FILE_MODE_READ\r
+ );\r
+\r
+ ASSERT_EFI_ERROR(Status);\r
+ FreePool(DirectoryName);\r
+\r
+ //\r
+ // Get the Volume Info from ShellFileHandle\r
+ //\r
+ SysInfo = NULL;\r
+ SysInfoSize = 0;\r
+ EfiFpHandle = ConvertShellHandleToEfiFileProtocol(ShellFileHandle);\r
+ Status = EfiFpHandle->GetInfo(\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
+\r
+ if (Status == EFI_BUFFER_TOO_SMALL) {\r
+ SysInfo = AllocateZeroPool(SysInfoSize);\r
+ Status = EfiFpHandle->GetInfo(\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
+ }\r
+\r
+ ASSERT_EFI_ERROR(Status);\r
+\r
+ gEfiShellProtocol->CloseFile(ShellFileHandle);\r
+ } else {\r
+ //\r
+ // Get the Volume Info from Node->Handle\r
+ //\r
+ SysInfo = NULL;\r
+ SysInfoSize = 0;\r
+ EfiFpHandle = ConvertShellHandleToEfiFileProtocol(Node->Handle);\r
+ Status = EfiFpHandle->GetInfo(\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
+\r
+ if (Status == EFI_BUFFER_TOO_SMALL) {\r
+ SysInfo = AllocateZeroPool(SysInfoSize);\r
+ Status = EfiFpHandle->GetInfo(\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
+ }\r
+\r
+ ASSERT_EFI_ERROR(Status);\r
+ }\r
+\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_SFO_HEADER),\r
+ gShellLevel2HiiHandle,\r
+ L"ls"\r
+ );\r
+ //\r
+ // print VolumeInfo table\r
+ //\r
+ ASSERT(SysInfo != NULL);\r
+ ShellPrintHiiEx (\r
+ 0,\r
+ gST->ConOut->Mode->CursorRow,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_SFO_VOLINFO),\r
+ gShellLevel2HiiHandle,\r
+ SysInfo->VolumeLabel,\r
+ SysInfo->VolumeSize,\r
+ SysInfo->ReadOnly?L"TRUE":L"FALSE",\r
+ SysInfo->FreeSpace,\r
+ SysInfo->BlockSize\r
+ );\r
+\r
+ SHELL_FREE_NON_NULL(SysInfo);\r
+\r
+ return (Status);\r
+}\r
+\r
+/**\r
+ print out the info on a single file.\r
+\r
+ @param[in] Sfo TRUE if in SFO, false otherwise.\r
+ @param[in] TheNode the EFI_SHELL_FILE_INFO node to print out information on.\r
+ @param[in] Files incremented if a file is printed.\r
+ @param[in] Size incremented by file size.\r
+ @param[in] Dirs incremented if a directory is printed.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+PrintFileInformation(\r
+ IN CONST BOOLEAN Sfo, \r
+ IN CONST EFI_SHELL_FILE_INFO *TheNode, \r
+ IN UINT64 *Files, \r
+ IN UINT64 *Size, \r
+ IN UINT64 *Dirs\r
+ )\r
+{\r
+ ASSERT(Files != NULL);\r
+ ASSERT(Size != NULL);\r
+ ASSERT(Dirs != NULL);\r
+ ASSERT(TheNode != NULL);\r
+\r
+ if (Sfo) {\r
+ //\r
+ // Print the FileInfo Table\r
+ //\r
+ ShellPrintHiiEx (\r
+ 0,\r
+ gST->ConOut->Mode->CursorRow,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_SFO_FILEINFO),\r
+ gShellLevel2HiiHandle,\r
+ TheNode->FullName,\r
+ TheNode->Info->FileSize,\r
+ TheNode->Info->PhysicalSize,\r
+ (TheNode->Info->Attribute & EFI_FILE_ARCHIVE) != 0?L"a":L"",\r
+ (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"d":L"",\r
+ (TheNode->Info->Attribute & EFI_FILE_HIDDEN) != 0?L"h":L"",\r
+ (TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L"r":L"",\r
+ (TheNode->Info->Attribute & EFI_FILE_SYSTEM) != 0?L"s":L"",\r
+ TheNode->Info->CreateTime.Hour,\r
+ TheNode->Info->CreateTime.Minute,\r
+ TheNode->Info->CreateTime.Second,\r
+ TheNode->Info->CreateTime.Day,\r
+ TheNode->Info->CreateTime.Month,\r
+ TheNode->Info->CreateTime.Year,\r
+ TheNode->Info->LastAccessTime.Hour,\r
+ TheNode->Info->LastAccessTime.Minute,\r
+ TheNode->Info->LastAccessTime.Second,\r
+ TheNode->Info->LastAccessTime.Day,\r
+ TheNode->Info->LastAccessTime.Month,\r
+ TheNode->Info->LastAccessTime.Year,\r
+ TheNode->Info->ModificationTime.Hour,\r
+ TheNode->Info->ModificationTime.Minute,\r
+ TheNode->Info->ModificationTime.Second,\r
+ TheNode->Info->ModificationTime.Day,\r
+ TheNode->Info->ModificationTime.Month,\r
+ TheNode->Info->ModificationTime.Year\r
+ );\r
+ } else {\r
+ //\r
+ // print this one out...\r
+ // first print the universal start, next print the type specific name format, last print the CRLF\r
+ //\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_LINE_START_ALL),\r
+ gShellLevel2HiiHandle,\r
+ &TheNode->Info->ModificationTime,\r
+ (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"<DIR>":L"",\r
+ (TheNode->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L'r':L' ',\r
+ TheNode->Info->FileSize\r
+ );\r
+ if (TheNode->Info->Attribute & EFI_FILE_DIRECTORY) {\r
+ (*Dirs)++;\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_LINE_END_DIR),\r
+ gShellLevel2HiiHandle,\r
+ TheNode->FileName\r
+ );\r
+ } else {\r
+ (*Files)++;\r
+ (*Size) += TheNode->Info->FileSize;\r
+ if ( (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".nsh", (CHAR16*)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)\r
+ || (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".efi", (CHAR16*)&(TheNode->FileName[StrLen (TheNode->FileName) - 4])) == 0)\r
+ ){\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_LINE_END_EXE),\r
+ gShellLevel2HiiHandle,\r
+ TheNode->FileName\r
+ );\r
+ } else {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_LINE_END_FILE),\r
+ gShellLevel2HiiHandle,\r
+ TheNode->FileName\r
+ );\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+/**\r
+ print out the header when not using standard format output.\r
+\r
+ @param[in] Path String with starting path.\r
+**/\r
+VOID\r
+EFIAPI\r
+PrintNonSfoHeader(\r
+ IN CONST CHAR16 *Path\r
+ )\r
+{\r
+ CHAR16 *DirectoryName;\r
+\r
+ //\r
+ // get directory name from path...\r
+ //\r
+ DirectoryName = GetFullyQualifiedPath(Path);\r
+\r
+ if (DirectoryName != NULL) {\r
+ //\r
+ // print header\r
+ //\r
+ ShellPrintHiiEx (\r
+ 0,\r
+ gST->ConOut->Mode->CursorRow,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_HEADER_LINE1),\r
+ gShellLevel2HiiHandle,\r
+ DirectoryName\r
+ );\r
+\r
+ SHELL_FREE_NON_NULL(DirectoryName);\r
+ }\r
+}\r
+\r
+/**\r
+ print out the footer when not using standard format output.\r
+\r
+ @param[in] Files The number of files.\r
+ @param[in] Size The size of files in bytes.\r
+ @param[in] Dirs The number of directories.\r
+**/\r
+VOID\r
+EFIAPI\r
+PrintNonSfoFooter(\r
+ IN UINT64 Files, \r
+ IN UINT64 Size, \r
+ IN UINT64 Dirs\r
+ )\r
+{\r
+ //\r
+ // print footer\r
+ //\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_LS_FOOTER_LINE),\r
+ gShellLevel2HiiHandle,\r
+ Files,\r
+ Size,\r
+ Dirs\r
+ );\r
+}\r
+\r
/**\r
print out the list of files and directories from the LS command\r
\r
UINT64 FileSize;\r
CHAR16 *DirectoryName;\r
UINTN LongestPath;\r
- EFI_FILE_SYSTEM_INFO *SysInfo;\r
- UINTN SysInfoSize;\r
- SHELL_FILE_HANDLE ShellFileHandle;\r
CHAR16 *CorrectedPath;\r
- EFI_FILE_PROTOCOL *EfiFpHandle;\r
\r
FileCount = 0;\r
DirCount = 0;\r
CorrectedPath = NULL;\r
\r
CorrectedPath = StrnCatGrow(&CorrectedPath, NULL, Path, 0);\r
- ASSERT(CorrectedPath != NULL);\r
- ShellCommandCleanPath(CorrectedPath);\r
+ if (CorrectedPath == NULL) {\r
+ return (SHELL_OUT_OF_RESOURCES);\r
+ }\r
+\r
+ PathCleanUpDirectories(CorrectedPath);\r
+\r
+ if (!Sfo) {\r
+ PrintNonSfoHeader(CorrectedPath);\r
+ }\r
\r
Status = ShellOpenFileMetaArg((CHAR16*)CorrectedPath, EFI_FILE_MODE_READ, &ListHead);\r
if (EFI_ERROR(Status)) {\r
+ SHELL_FREE_NON_NULL(CorrectedPath);\r
+ if(Status == EFI_NOT_FOUND){\r
+ return (SHELL_NOT_FOUND);\r
+ }\r
return (SHELL_DEVICE_ERROR);\r
}\r
if (ListHead == NULL || IsListEmpty(&ListHead->Link)) {\r
+ SHELL_FREE_NON_NULL(CorrectedPath);\r
//\r
// On the first one only we expect to find something...\r
// do we find the . and .. directories otherwise?\r
}\r
\r
if (Sfo && First) {\r
- //\r
- // Get the first valid handle (directories)\r
- //\r
- for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)\r
- ; !IsNull(&ListHead->Link, &Node->Link) && Node->Handle == NULL\r
- ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)\r
- );\r
-\r
- if (Node->Handle == NULL) {\r
- DirectoryName = GetFullyQualifiedPath(((EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link))->FullName);\r
-\r
- //\r
- // We need to open something up to get system information\r
- //\r
- Status = gEfiShellProtocol->OpenFileByName(\r
- DirectoryName,\r
- &ShellFileHandle,\r
- EFI_FILE_MODE_READ);\r
-\r
- ASSERT_EFI_ERROR(Status);\r
- FreePool(DirectoryName);\r
-\r
- //\r
- // Get the Volume Info from ShellFileHandle\r
- //\r
- SysInfo = NULL;\r
- SysInfoSize = 0;\r
- EfiFpHandle = ConvertShellHandleToEfiFileProtocol(ShellFileHandle);\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\r
-\r
- if (Status == EFI_BUFFER_TOO_SMALL) {\r
- SysInfo = AllocateZeroPool(SysInfoSize);\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\r
- }\r
-\r
- ASSERT_EFI_ERROR(Status);\r
-\r
- gEfiShellProtocol->CloseFile(ShellFileHandle);\r
- } else {\r
- //\r
- // Get the Volume Info from Node->Handle\r
- //\r
- SysInfo = NULL;\r
- SysInfoSize = 0;\r
- EfiFpHandle = ConvertShellHandleToEfiFileProtocol(Node->Handle);\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\r
-\r
- if (Status == EFI_BUFFER_TOO_SMALL) {\r
- SysInfo = AllocateZeroPool(SysInfoSize);\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\r
- }\r
-\r
- ASSERT_EFI_ERROR(Status);\r
- }\r
-\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_GEN_SFO_HEADER),\r
- gShellLevel2HiiHandle,\r
- L"ls");\r
- //\r
- // print VolumeInfo table\r
- //\r
- ASSERT(SysInfo != NULL);\r
- ShellPrintHiiEx (\r
- 0,\r
- gST->ConOut->Mode->CursorRow,\r
- NULL,\r
- STRING_TOKEN (STR_LS_SFO_VOLINFO),\r
- gShellLevel2HiiHandle,\r
- SysInfo->VolumeLabel,\r
- SysInfo->VolumeSize,\r
- SysInfo->ReadOnly?L"TRUE":L"FALSE",\r
- SysInfo->FreeSpace,\r
- SysInfo->BlockSize\r
- );\r
- if (SysInfo != NULL) {\r
- FreePool(SysInfo);\r
- }\r
+ PrintSfoVolumeInfoTableEntry(ListHead);\r
}\r
\r
- if (!Sfo) {\r
- //\r
- // get directory name from path...\r
- //\r
- DirectoryName = GetFullyQualifiedPath(CorrectedPath);\r
-\r
- //\r
- // print header\r
- //\r
- ShellPrintHiiEx (\r
- 0,\r
- gST->ConOut->Mode->CursorRow,\r
- NULL,\r
- STRING_TOKEN (STR_LS_HEADER_LINE1),\r
- gShellLevel2HiiHandle,\r
- DirectoryName\r
- );\r
- FreePool(DirectoryName);\r
- }\r
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)\r
; !IsNull(&ListHead->Link, &Node->Link)\r
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)\r
- ){\r
+ ){\r
ASSERT(Node != NULL);\r
if (LongestPath < StrSize(Node->FullName)) {\r
LongestPath = StrSize(Node->FullName);\r
){\r
continue;\r
}\r
- } else if (Attribs != EFI_FILE_VALID_ATTR) {\r
- if (Count == 1) {\r
- //\r
- // the bit must match\r
- //\r
- if ( (Node->Info->Attribute & Attribs) != Attribs) {\r
- continue;\r
- }\r
- } else {\r
- //\r
- // exact match on all bits\r
- //\r
- if ( (Node->Info->Attribute|EFI_FILE_ARCHIVE) != (Attribs|EFI_FILE_ARCHIVE)) {\r
- continue;\r
- }\r
- }\r
- }\r
-\r
- if (Sfo) {\r
- //\r
- // Print the FileInfo Table\r
- //\r
- ShellPrintHiiEx (\r
- 0,\r
- gST->ConOut->Mode->CursorRow,\r
- NULL,\r
- STRING_TOKEN (STR_LS_SFO_FILEINFO),\r
- gShellLevel2HiiHandle,\r
- Node->FullName,\r
- Node->Info->FileSize,\r
- Node->Info->PhysicalSize,\r
- (Node->Info->Attribute & EFI_FILE_ARCHIVE) != 0?L"a":L"",\r
- (Node->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"d":L"",\r
- (Node->Info->Attribute & EFI_FILE_HIDDEN) != 0?L"h":L"",\r
- (Node->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L"r":L"",\r
- (Node->Info->Attribute & EFI_FILE_SYSTEM) != 0?L"s":L"",\r
- Node->Info->CreateTime.Hour,\r
- Node->Info->CreateTime.Minute,\r
- Node->Info->CreateTime.Second,\r
- Node->Info->CreateTime.Day,\r
- Node->Info->CreateTime.Month,\r
- Node->Info->CreateTime.Year,\r
- Node->Info->LastAccessTime.Hour,\r
- Node->Info->LastAccessTime.Minute,\r
- Node->Info->LastAccessTime.Second,\r
- Node->Info->LastAccessTime.Day,\r
- Node->Info->LastAccessTime.Month,\r
- Node->Info->LastAccessTime.Year,\r
- Node->Info->ModificationTime.Hour,\r
- Node->Info->ModificationTime.Minute,\r
- Node->Info->ModificationTime.Second,\r
- Node->Info->ModificationTime.Day,\r
- Node->Info->ModificationTime.Month,\r
- Node->Info->ModificationTime.Year\r
- );\r
- } else {\r
+ } else if ((Attribs != EFI_FILE_VALID_ATTR) ||\r
+ (Count == 5)) {\r
//\r
- // print this one out...\r
- // first print the universal start, next print the type specific name format, last print the CRLF\r
+ // Only matches the bits which "Attribs" contains, not\r
+ // all files/directories with any of the bits.\r
+ // Count == 5 is used to tell the difference between a user\r
+ // specifying all bits (EX: -arhsda) and just specifying\r
+ // -a (means display all files with any attribute).\r
//\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_LS_LINE_START_ALL),\r
- gShellLevel2HiiHandle,\r
- &Node->Info->ModificationTime,\r
- (Node->Info->Attribute & EFI_FILE_DIRECTORY) != 0?L"<DIR>":L"",\r
- (Node->Info->Attribute & EFI_FILE_READ_ONLY) != 0?L'r':L' ',\r
- Node->Info->FileSize\r
- );\r
- if (Node->Info->Attribute & EFI_FILE_DIRECTORY) {\r
- DirCount++;\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_LS_LINE_END_DIR),\r
- gShellLevel2HiiHandle,\r
- Node->FileName\r
- );\r
- } else {\r
- FileCount++;\r
- FileSize += Node->Info->FileSize;\r
- if ( (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".nsh", (CHAR16*)&(Node->FileName[StrLen (Node->FileName) - 4])) == 0)\r
- || (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)L".efi", (CHAR16*)&(Node->FileName[StrLen (Node->FileName) - 4])) == 0)\r
- ){\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_LS_LINE_END_EXE),\r
- gShellLevel2HiiHandle,\r
- Node->FileName\r
- );\r
- } else {\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_LS_LINE_END_FILE),\r
- gShellLevel2HiiHandle,\r
- Node->FileName\r
- );\r
- }\r
+ if ( (Node->Info->Attribute & Attribs) != Attribs) {\r
+ continue;\r
}\r
}\r
+\r
+ PrintFileInformation(Sfo, Node, &FileCount, &FileSize, &DirCount);\r
}\r
\r
if (!Sfo) {\r
- //\r
- // print footer\r
- //\r
- ShellPrintHiiEx (\r
- -1,\r
- -1,\r
- NULL,\r
- STRING_TOKEN (STR_LS_FOOTER_LINE),\r
- gShellLevel2HiiHandle,\r
- FileCount,\r
- FileSize,\r
- DirCount\r
- );\r
+ PrintNonSfoFooter(FileCount, FileSize, DirCount);\r
}\r
\r
if (Rec){\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
for ( Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&ListHead->Link)\r
- ; !IsNull(&ListHead->Link, &Node->Link)\r
+ ; !IsNull(&ListHead->Link, &Node->Link) && ShellStatus == SHELL_SUCCESS\r
; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&ListHead->Link, &Node->Link)\r
){\r
+ if (ShellGetExecutionBreakFlag ()) {\r
+ ShellStatus = SHELL_ABORTED;\r
+ break;\r
+ }\r
+\r
//\r
// recurse on any directory except the traversing ones...\r
//\r
){\r
StrCpy(DirectoryName, Node->FullName);\r
StrCat(DirectoryName, L"\\*");\r
- PrintLsOutput(\r
+ ShellStatus = PrintLsOutput(\r
Rec,\r
Attribs,\r
Sfo,\r
\r
FreePool(CorrectedPath);\r
ShellCloseFileMetaArg(&ListHead);\r
- FreePool(ListHead);\r
return (ShellStatus);\r
}\r
\r
}\r
}\r
if (PathName != NULL) {\r
- ASSERT((FullPath == NULL && Size == 0) || (FullPath != NULL));\r
- StrnCatGrow(&FullPath, &Size, PathName, 0);\r
- if (ShellIsDirectory(PathName) == EFI_SUCCESS) {\r
- StrnCatGrow(&FullPath, &Size, L"\\*", 0);\r
+ if (StrStr(PathName, L":") == NULL && gEfiShellProtocol->GetCurDir(NULL) == NULL) {\r
+ ShellStatus = SHELL_NOT_FOUND;\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);\r
+ } else {\r
+ ASSERT((FullPath == NULL && Size == 0) || (FullPath != NULL));\r
+ StrnCatGrow(&FullPath, &Size, PathName, 0);\r
+ if (ShellIsDirectory(PathName) == EFI_SUCCESS) {\r
+ if (PathName[StrLen (PathName) - 1] == '\\') {\r
+ //\r
+ // For path ending with '\', just append '*'.\r
+ //\r
+ StrnCatGrow (&FullPath, &Size, L"*", 0);\r
+ } else if (PathName[StrLen (PathName) - 1] == '*') {\r
+ //\r
+ // For path ending with '*', do nothing.\r
+ //\r
+ } else {\r
+ //\r
+ // Otherwise, append '\*' to directory name.\r
+ //\r
+ StrnCatGrow (&FullPath, &Size, L"\\*", 0);\r
+ }\r
+ }\r
}\r
} else {\r
ASSERT(FullPath == NULL);\r
StrnCatGrow(&FullPath, NULL, L"*", 0);\r
}\r
Status = gRT->GetTime(&TheTime, NULL);\r
- ASSERT_EFI_ERROR(Status);\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN), gShellLevel2HiiHandle, L"gRT->GetTime", Status);\r
+ TheTime.TimeZone = EFI_UNSPECIFIED_TIMEZONE;\r
+ }\r
+\r
SfoMode = ShellCommandLineGetFlag(Package, L"-sfo");\r
if (ShellStatus == SHELL_SUCCESS) {\r
ShellStatus = PrintLsOutput(\r
FullPath,\r
TRUE,\r
Count,\r
- (INT16)(TheTime.TimeZone==2047?0:TheTime.TimeZone)\r
+ (INT16)(TheTime.TimeZone==EFI_UNSPECIFIED_TIMEZONE?0:TheTime.TimeZone)\r
);\r
if (ShellStatus == SHELL_NOT_FOUND) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_FILES), gShellLevel2HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LS_FILE_NOT_FOUND), gShellLevel2HiiHandle);\r
} else if (ShellStatus == SHELL_INVALID_PARAMETER) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle);\r
+ } else if (ShellStatus == SHELL_ABORTED) {\r
+ //\r
+ // Ignore aborting.\r
+ //\r
} else if (ShellStatus != SHELL_SUCCESS) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle);\r
}\r
projects / mirror_edk2.git / blobdiff