summaryrefslogtreecommitdiffstats
path: root/ShellPkg
diff options
context:
space:
mode:
authorRuiyu Ni <ruiyu.ni@intel.com>2016-08-08 15:02:44 +0800
committerRuiyu Ni <ruiyu.ni@intel.com>2016-08-10 10:17:13 +0800
commit47ec935660cd38659efcb414ab2cb819c0cb466e (patch)
treec9ccc0ae9f5484f45b6ea666646d12e34f75bac5 /ShellPkg
parent54b1e0ec814d8a8ac0aea2262ba04d7567545197 (diff)
downloadedk2-47ec935660cd38659efcb414ab2cb819c0cb466e.tar.gz
edk2-47ec935660cd38659efcb414ab2cb819c0cb466e.tar.bz2
edk2-47ec935660cd38659efcb414ab2cb819c0cb466e.zip
ShellPkg/ls: Fix to support "ls fs0:File.txt"
“ls fs0:\File.txt" can list the file correctly but when the backslash is removed from colon, the file cannot be listed. The patch fixes this issue. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Tapan Shah <tapandshah@hpe.com>
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 25bf8ca9e1..6d3cc95f4b 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -2,7 +2,7 @@
Main file for ls shell level 2 function.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
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
@@ -707,10 +707,9 @@ ShellCommandRunLs (
//
// 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;
+ StrnCatGrow(&SearchString, NULL, FullPath, 0);
+ PathRemoveLastItem (FullPath);
+ CopyMem (SearchString, SearchString + StrLen (FullPath), StrSize (SearchString + StrLen (FullPath)));
}
}
}