From 2ec013ce0f9524f140de23810999ed8a62086fc3 Mon Sep 17 00:00:00 2001 From: jcarsey Date: Tue, 29 Mar 2011 20:19:51 +0000 Subject: clarify error message when listing files based on a metaname without a current working directory. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11450 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c index 73765113f4..64dfae3291 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c @@ -523,10 +523,15 @@ ShellCommandRunLs ( } } 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); + if (StrStr(PathName, L":") == NULL && gEfiShellProtocol->GetCurDir(NULL) == NULL) { + ShellStatus = SHELL_NOT_FOUND; + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle); + } else { + ASSERT((FullPath == NULL && Size == 0) || (FullPath != NULL)); + StrnCatGrow(&FullPath, &Size, PathName, 0); + if (ShellIsDirectory(PathName) == EFI_SUCCESS) { + StrnCatGrow(&FullPath, &Size, L"\\*", 0); + } } } else { ASSERT(FullPath == NULL); -- cgit v1.2.3