diff options
| author | Jaben Carsey <jaben.carsey@intel.com> | 2013-12-13 18:45:43 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-12-13 18:45:43 +0000 |
| commit | daf705847f33db1f7a17c1c5b2a01d8f8ccba0ac (patch) | |
| tree | c5670d5815c390511500f83142bf6fbe078b724a | |
| parent | 680db511530e8b4e12545cad97cd344aba930201 (diff) | |
| download | edk2-platforms-daf705847f33db1f7a17c1c5b2a01d8f8ccba0ac.tar.xz | |
ShellPkg: Refactor change to current file system
This moves the initialization for handling file system changes into a separate function.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14983 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ShellPkg/Application/Shell/Shell.c | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index b3dc8766ee..0cf09ec76b 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1618,6 +1618,43 @@ ProcessNewSplitCommandLine( }
return (Status);
}
+
+/**
+ Handle a request to change the current file system
+
+ @param[in] CmdLine The passed in command line
+
+ @retval EFI_SUCCESS The operation was successful
+**/
+EFI_STATUS
+EFIAPI
+ChangeMappedDrive(
+ IN CONST CHAR16 *CmdLine
+ )
+{
+ EFI_STATUS Status;
+ Status = EFI_SUCCESS;
+
+ //
+ // make sure we are the right operation
+ //
+ ASSERT(CmdLine[(StrLen(CmdLine)-1)] == L':' && StrStr(CmdLine, L" ") == NULL);
+
+ //
+ // Call the protocol API to do the work
+ //
+ Status = ShellInfoObject.NewEfiShellProtocol->SetCurDir(NULL, CmdLine);
+
+ //
+ // Report any errors
+ //
+ if (EFI_ERROR(Status)) {
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_MAPPING), ShellInfoObject.HiiHandle, CmdLine);
+ }
+
+ return (Status);
+}
+
/**
Function will process and run a command line.
@@ -1702,19 +1739,16 @@ RunCommand( if (ContainsSplit(CleanOriginal)) {
Status = ProcessNewSplitCommandLine(CleanOriginal);
} else {
-
//
// If this is a mapped drive change handle that...
//
if (CleanOriginal[(StrLen(CleanOriginal)-1)] == L':' && StrStr(CleanOriginal, L" ") == NULL) {
- Status = ShellInfoObject.NewEfiShellProtocol->SetCurDir(NULL, CleanOriginal);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_MAPPING), ShellInfoObject.HiiHandle, CleanOriginal);
- }
- FreePool(CleanOriginal);
+ Status = ChangeMappedDrive(CleanOriginal);
+ SHELL_FREE_NON_NULL(CleanOriginal);
return (Status);
}
+
///@todo update this section to divide into 3 ways - run internal command, run split (above), and run an external file...
/// We waste a lot of time doing processing like StdIn,StdOut,Argv,Argc for things that are external files...
|