@retval FALSE The move is within a file system.\r
**/\r
BOOLEAN\r
-IsBetweenFileSystem(\r
- IN CONST CHAR16 *FullName,\r
- IN CONST CHAR16 *Cwd,\r
- IN CONST CHAR16 *DestPath\r
+IsBetweenFileSystem (\r
+ IN CONST CHAR16 *FullName,\r
+ IN CONST CHAR16 *Cwd,\r
+ IN CONST CHAR16 *DestPath\r
)\r
{\r
CHAR16 *Test;\r
CHAR16 *Test1;\r
UINTN Result;\r
\r
- Test = StrStr(FullName, L":");\r
- if (Test == NULL && Cwd != NULL) {\r
- Test = StrStr(Cwd, L":");\r
+ Test = StrStr (FullName, L":");\r
+ if ((Test == NULL) && (Cwd != NULL)) {\r
+ Test = StrStr (Cwd, L":");\r
}\r
- Test1 = StrStr(DestPath, L":");\r
- if (Test1 == NULL && Cwd != NULL) {\r
- Test1 = StrStr(Cwd, L":");\r
+\r
+ Test1 = StrStr (DestPath, L":");\r
+ if ((Test1 == NULL) && (Cwd != NULL)) {\r
+ Test1 = StrStr (Cwd, L":");\r
}\r
- if (Test1 != NULL && Test != NULL) {\r
- *Test = CHAR_NULL;\r
+\r
+ if ((Test1 != NULL) && (Test != NULL)) {\r
+ *Test = CHAR_NULL;\r
*Test1 = CHAR_NULL;\r
- Result = StringNoCaseCompare(&FullName, &DestPath);\r
- *Test = L':';\r
+ Result = StringNoCaseCompare (&FullName, &DestPath);\r
+ *Test = L':';\r
*Test1 = L':';\r
if (Result != 0) {\r
return (TRUE);\r
}\r
}\r
+\r
return (FALSE);\r
}\r
\r
@retval FALSE The source path is invalid.\r
**/\r
BOOLEAN\r
-IsSoucePathValid(\r
- IN CONST CHAR16* SrcPath,\r
- IN CONST CHAR16* CwdPath\r
+IsSoucePathValid (\r
+ IN CONST CHAR16 *SrcPath,\r
+ IN CONST CHAR16 *CwdPath\r
)\r
{\r
- CHAR16* SrcPathBuffer;\r
- CHAR16* CwdPathBuffer;\r
- BOOLEAN Ret;\r
+ CHAR16 *SrcPathBuffer;\r
+ CHAR16 *CwdPathBuffer;\r
+ BOOLEAN Ret;\r
\r
ASSERT (CwdPath != NULL);\r
if (SrcPath == NULL) {\r
\r
CwdPathBuffer = AllocateCopyPool (StrSize (CwdPath), CwdPath);\r
if (CwdPathBuffer == NULL) {\r
- FreePool(SrcPathBuffer);\r
+ FreePool (SrcPathBuffer);\r
return FALSE;\r
}\r
\r
gUnicodeCollation->StrUpr (gUnicodeCollation, SrcPathBuffer);\r
gUnicodeCollation->StrUpr (gUnicodeCollation, CwdPathBuffer);\r
\r
- if (SrcPathBuffer[StrLen (SrcPathBuffer) -1 ] == L'\\') {\r
+ if (SrcPathBuffer[StrLen (SrcPathBuffer) -1] == L'\\') {\r
SrcPathBuffer[StrLen (SrcPathBuffer) - 1] = CHAR_NULL;\r
}\r
\r
CwdPathBuffer[StrLen (CwdPathBuffer) - 1] = CHAR_NULL;\r
}\r
\r
- if (StrCmp (CwdPathBuffer, SrcPathBuffer) == 0 ||\r
+ if ((StrCmp (CwdPathBuffer, SrcPathBuffer) == 0) ||\r
((StrStr (CwdPathBuffer, SrcPathBuffer) == CwdPathBuffer) &&\r
(CwdPathBuffer[StrLen (SrcPathBuffer)] == L'\\'))\r
- ) {\r
+ )\r
+ {\r
Ret = FALSE;\r
}\r
\r
@retval FALSE The move is not\r
**/\r
BOOLEAN\r
-IsValidMove(\r
- IN CONST CHAR16 *SourcePath,\r
- IN CONST CHAR16 *Cwd,\r
- IN CONST CHAR16 *DestPath,\r
- IN CONST UINT64 Attribute,\r
- IN CONST UINT64 DestAttr,\r
- IN CONST EFI_STATUS FileStatus\r
+IsValidMove (\r
+ IN CONST CHAR16 *SourcePath,\r
+ IN CONST CHAR16 *Cwd,\r
+ IN CONST CHAR16 *DestPath,\r
+ IN CONST UINT64 Attribute,\r
+ IN CONST UINT64 DestAttr,\r
+ IN CONST EFI_STATUS FileStatus\r
)\r
{\r
CHAR16 *DestPathCopy;\r
//\r
// Invalid move\r
//\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_MV_INV_CWD), gShellLevel2HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MV_INV_CWD), gShellLevel2HiiHandle);\r
return FALSE;\r
}\r
}\r
//\r
// invalid to move read only or move to a read only destination\r
//\r
- if (((Attribute & EFI_FILE_READ_ONLY) != 0)\r
- || (FileStatus == EFI_WRITE_PROTECTED)\r
- || ((DestAttr & EFI_FILE_READ_ONLY) != 0)\r
- ) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_RO), gShellLevel2HiiHandle, SourcePath);\r
+ if ( ((Attribute & EFI_FILE_READ_ONLY) != 0)\r
+ || (FileStatus == EFI_WRITE_PROTECTED)\r
+ || ((DestAttr & EFI_FILE_READ_ONLY) != 0)\r
+ )\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MV_INV_RO), gShellLevel2HiiHandle, SourcePath);\r
return (FALSE);\r
}\r
\r
- DestPathCopy = AllocateCopyPool(StrSize(DestPath), DestPath);\r
+ DestPathCopy = AllocateCopyPool (StrSize (DestPath), DestPath);\r
if (DestPathCopy == NULL) {\r
return (FALSE);\r
}\r
\r
- for (DestPathWalker = DestPathCopy; *DestPathWalker == L'\\'; DestPathWalker++) ;\r
+ for (DestPathWalker = DestPathCopy; *DestPathWalker == L'\\'; DestPathWalker++) {\r
+ }\r
\r
- while(DestPathWalker != NULL && DestPathWalker[StrLen(DestPathWalker)-1] == L'\\') {\r
- DestPathWalker[StrLen(DestPathWalker)-1] = CHAR_NULL;\r
+ while (DestPathWalker != NULL && DestPathWalker[StrLen (DestPathWalker)-1] == L'\\') {\r
+ DestPathWalker[StrLen (DestPathWalker)-1] = CHAR_NULL;\r
}\r
\r
- ASSERT(DestPathWalker != NULL);\r
- ASSERT(SourcePath != NULL);\r
+ ASSERT (DestPathWalker != NULL);\r
+ ASSERT (SourcePath != NULL);\r
\r
//\r
// If they're the same, or if source is "above" dest on file path tree\r
//\r
- if ( StringNoCaseCompare (&DestPathWalker, &SourcePath) == 0 ||\r
- ((StrStr(DestPathWalker, SourcePath) == DestPathWalker) &&\r
- (DestPathWalker[StrLen(SourcePath)] == '\\')\r
- )\r
- ) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_SUB), gShellLevel2HiiHandle);\r
- FreePool(DestPathCopy);\r
+ if ((StringNoCaseCompare (&DestPathWalker, &SourcePath) == 0) ||\r
+ ((StrStr (DestPathWalker, SourcePath) == DestPathWalker) &&\r
+ (DestPathWalker[StrLen (SourcePath)] == '\\')\r
+ )\r
+ )\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MV_INV_SUB), gShellLevel2HiiHandle);\r
+ FreePool (DestPathCopy);\r
return (FALSE);\r
}\r
- FreePool(DestPathCopy);\r
+\r
+ FreePool (DestPathCopy);\r
\r
return (TRUE);\r
}\r
@retval SHELL_SUCCESS The operation was sucessful.\r
**/\r
SHELL_STATUS\r
-GetDestinationLocation(\r
- IN CONST CHAR16 *DestParameter,\r
- IN OUT CHAR16 **DestPathPointer,\r
- IN CONST CHAR16 *Cwd,\r
- IN CONST BOOLEAN SingleSource,\r
- IN OUT UINT64 *DestAttr\r
+GetDestinationLocation (\r
+ IN CONST CHAR16 *DestParameter,\r
+ IN OUT CHAR16 **DestPathPointer,\r
+ IN CONST CHAR16 *Cwd,\r
+ IN CONST BOOLEAN SingleSource,\r
+ IN OUT UINT64 *DestAttr\r
)\r
{\r
- EFI_SHELL_FILE_INFO *DestList;\r
- EFI_SHELL_FILE_INFO *Node;\r
- CHAR16 *DestPath;\r
- UINTN NewSize;\r
- UINTN CurrentSize;\r
+ EFI_SHELL_FILE_INFO *DestList;\r
+ EFI_SHELL_FILE_INFO *Node;\r
+ CHAR16 *DestPath;\r
+ UINTN NewSize;\r
+ UINTN CurrentSize;\r
\r
DestList = NULL;\r
DestPath = NULL;\r
\r
- ASSERT(DestAttr != NULL);\r
+ ASSERT (DestAttr != NULL);\r
\r
- if (StrStr(DestParameter, L"\\") == DestParameter) {\r
+ if (StrStr (DestParameter, L"\\") == DestParameter) {\r
if (Cwd == NULL) {\r
return SHELL_INVALID_PARAMETER;\r
}\r
- DestPath = AllocateZeroPool(StrSize(Cwd));\r
+\r
+ DestPath = AllocateZeroPool (StrSize (Cwd));\r
if (DestPath == NULL) {\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- StrCpyS(DestPath, StrSize(Cwd) / sizeof(CHAR16), Cwd);\r
- while (PathRemoveLastItem(DestPath)) ;\r
+\r
+ StrCpyS (DestPath, StrSize (Cwd) / sizeof (CHAR16), Cwd);\r
+ while (PathRemoveLastItem (DestPath)) {\r
+ }\r
\r
//\r
// Append DestParameter beyond '\' which may be present\r
//\r
- CurrentSize = StrSize(DestPath);\r
- StrnCatGrow(&DestPath, &CurrentSize, &DestParameter[1], 0);\r
+ CurrentSize = StrSize (DestPath);\r
+ StrnCatGrow (&DestPath, &CurrentSize, &DestParameter[1], 0);\r
\r
*DestPathPointer = DestPath;\r
return (SHELL_SUCCESS);\r
}\r
+\r
//\r
// get the destination path\r
//\r
- ShellOpenFileMetaArg((CHAR16*)DestParameter, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
- if (DestList == NULL || IsListEmpty(&DestList->Link)) {\r
+ ShellOpenFileMetaArg ((CHAR16 *)DestParameter, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
+ if ((DestList == NULL) || IsListEmpty (&DestList->Link)) {\r
//\r
// Not existing... must be renaming\r
//\r
- if (StrStr(DestParameter, L":") == NULL) {\r
+ if (StrStr (DestParameter, L":") == NULL) {\r
if (Cwd == NULL) {\r
- ShellCloseFileMetaArg(&DestList);\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);\r
+ ShellCloseFileMetaArg (&DestList);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
- NewSize = StrSize(Cwd);\r
- NewSize += StrSize(DestParameter);\r
- DestPath = AllocateZeroPool(NewSize);\r
+\r
+ NewSize = StrSize (Cwd);\r
+ NewSize += StrSize (DestParameter);\r
+ DestPath = AllocateZeroPool (NewSize);\r
if (DestPath == NULL) {\r
- ShellCloseFileMetaArg(&DestList);\r
+ ShellCloseFileMetaArg (&DestList);\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- StrCpyS(DestPath, NewSize / sizeof(CHAR16), Cwd);\r
- if (DestPath[StrLen(DestPath)-1] != L'\\' && DestParameter[0] != L'\\') {\r
- StrCatS(DestPath, NewSize / sizeof(CHAR16), L"\\");\r
- } else if (DestPath[StrLen(DestPath)-1] == L'\\' && DestParameter[0] == L'\\') {\r
- ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
+\r
+ StrCpyS (DestPath, NewSize / sizeof (CHAR16), Cwd);\r
+ if ((DestPath[StrLen (DestPath)-1] != L'\\') && (DestParameter[0] != L'\\')) {\r
+ StrCatS (DestPath, NewSize / sizeof (CHAR16), L"\\");\r
+ } else if ((DestPath[StrLen (DestPath)-1] == L'\\') && (DestParameter[0] == L'\\')) {\r
+ ((CHAR16 *)DestPath)[StrLen (DestPath)-1] = CHAR_NULL;\r
}\r
- StrCatS(DestPath, NewSize / sizeof(CHAR16), DestParameter);\r
+\r
+ StrCatS (DestPath, NewSize / sizeof (CHAR16), DestParameter);\r
} else {\r
- ASSERT(DestPath == NULL);\r
- DestPath = StrnCatGrow(&DestPath, NULL, DestParameter, 0);\r
+ ASSERT (DestPath == NULL);\r
+ DestPath = StrnCatGrow (&DestPath, NULL, DestParameter, 0);\r
if (DestPath == NULL) {\r
- ShellCloseFileMetaArg(&DestList);\r
+ ShellCloseFileMetaArg (&DestList);\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
}\r
} else {\r
- Node = (EFI_SHELL_FILE_INFO*)GetFirstNode(&DestList->Link);\r
+ Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&DestList->Link);\r
*DestAttr = Node->Info->Attribute;\r
//\r
// Make sure there is only 1 node in the list.\r
//\r
- if (!IsNodeAtEnd(&DestList->Link, &Node->Link)) {\r
- ShellCloseFileMetaArg(&DestList);\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);\r
+ if (!IsNodeAtEnd (&DestList->Link, &Node->Link)) {\r
+ ShellCloseFileMetaArg (&DestList);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
//\r
// If we are a directory or a single file, then one node is fine.\r
//\r
- if (ShellIsDirectory(Node->FullName)==EFI_SUCCESS || SingleSource) {\r
- DestPath = AllocateZeroPool(StrSize(Node->FullName)+sizeof(CHAR16));\r
+ if ((ShellIsDirectory (Node->FullName) == EFI_SUCCESS) || SingleSource) {\r
+ DestPath = AllocateZeroPool (StrSize (Node->FullName)+sizeof (CHAR16));\r
if (DestPath == NULL) {\r
- ShellCloseFileMetaArg(&DestList);\r
+ ShellCloseFileMetaArg (&DestList);\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- StrCpyS(DestPath, (StrSize(Node->FullName)+sizeof(CHAR16)) / sizeof(CHAR16), Node->FullName);\r
- StrCatS(DestPath, (StrSize(Node->FullName)+sizeof(CHAR16)) / sizeof(CHAR16), L"\\");\r
+\r
+ StrCpyS (DestPath, (StrSize (Node->FullName)+sizeof (CHAR16)) / sizeof (CHAR16), Node->FullName);\r
+ StrCatS (DestPath, (StrSize (Node->FullName)+sizeof (CHAR16)) / sizeof (CHAR16), L"\\");\r
} else {\r
//\r
// cant move multiple files onto a single file.\r
//\r
- ShellCloseFileMetaArg(&DestList);\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);\r
+ ShellCloseFileMetaArg (&DestList);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_ERROR), gShellLevel2HiiHandle, L"mv", DestParameter);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
}\r
\r
*DestPathPointer = DestPath;\r
- ShellCloseFileMetaArg(&DestList);\r
+ ShellCloseFileMetaArg (&DestList);\r
\r
return (SHELL_SUCCESS);\r
}\r
@retval SHELL_SUCCESS The source file was moved to the destination.\r
**/\r
EFI_STATUS\r
-MoveBetweenFileSystems(\r
+MoveBetweenFileSystems (\r
IN EFI_SHELL_FILE_INFO *Node,\r
IN CONST CHAR16 *DestPath,\r
OUT VOID **Resp\r
)\r
{\r
- SHELL_STATUS ShellStatus;\r
+ SHELL_STATUS ShellStatus;\r
\r
//\r
// First we copy the file\r
//\r
// The copy was successful. delete the source file.\r
//\r
- CascadeDelete(Node, TRUE);\r
+ CascadeDelete (Node, TRUE);\r
Node->Handle = NULL;\r
} else if (ShellStatus == SHELL_ABORTED) {\r
return EFI_ABORTED;\r
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed\r
**/\r
EFI_STATUS\r
-CreateFullDestPath(\r
- IN CONST CHAR16 **DestPath,\r
- OUT CHAR16 **FullDestPath,\r
- IN CONST CHAR16 *FileName\r
+CreateFullDestPath (\r
+ IN CONST CHAR16 **DestPath,\r
+ OUT CHAR16 **FullDestPath,\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- UINTN Size;\r
- if (FullDestPath == NULL || FileName == NULL || DestPath == NULL || *DestPath == NULL){\r
+ UINTN Size;\r
+\r
+ if ((FullDestPath == NULL) || (FileName == NULL) || (DestPath == NULL) || (*DestPath == NULL)) {\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
- Size = StrSize(*DestPath) + StrSize(FileName);\r
+ Size = StrSize (*DestPath) + StrSize (FileName);\r
\r
- *FullDestPath = AllocateZeroPool(Size);\r
- if (*FullDestPath == NULL){\r
+ *FullDestPath = AllocateZeroPool (Size);\r
+ if (*FullDestPath == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
\r
- StrCpyS(*FullDestPath, Size / sizeof(CHAR16), *DestPath);\r
- if ((*FullDestPath)[StrLen(*FullDestPath)-1] != L'\\' && FileName[0] != L'\\') {\r
- StrCatS(*FullDestPath, Size / sizeof(CHAR16), L"\\");\r
+ StrCpyS (*FullDestPath, Size / sizeof (CHAR16), *DestPath);\r
+ if (((*FullDestPath)[StrLen (*FullDestPath)-1] != L'\\') && (FileName[0] != L'\\')) {\r
+ StrCatS (*FullDestPath, Size / sizeof (CHAR16), L"\\");\r
}\r
- StrCatS(*FullDestPath, Size / sizeof(CHAR16), FileName);\r
+\r
+ StrCatS (*FullDestPath, Size / sizeof (CHAR16), FileName);\r
\r
return (EFI_SUCCESS);\r
}\r
@retval SHELL_OUT_OF_RESOURCES A memory allocation failed.\r
**/\r
EFI_STATUS\r
-MoveWithinFileSystems(\r
+MoveWithinFileSystems (\r
IN EFI_SHELL_FILE_INFO *Node,\r
IN CHAR16 *DestPath,\r
OUT VOID **Resp\r
)\r
{\r
- EFI_FILE_INFO *NewFileInfo;\r
- CHAR16 *TempLocation;\r
- UINTN NewSize;\r
- UINTN Length;\r
- EFI_STATUS Status;\r
+ EFI_FILE_INFO *NewFileInfo;\r
+ CHAR16 *TempLocation;\r
+ UINTN NewSize;\r
+ UINTN Length;\r
+ EFI_STATUS Status;\r
\r
//\r
// Chop off map info from DestPath\r
//\r
- if ((TempLocation = StrStr(DestPath, L":")) != NULL) {\r
- CopyMem(DestPath, TempLocation+1, StrSize(TempLocation+1));\r
+ if ((TempLocation = StrStr (DestPath, L":")) != NULL) {\r
+ CopyMem (DestPath, TempLocation+1, StrSize (TempLocation+1));\r
}\r
\r
//\r
// construct the new file info block\r
//\r
- NewSize = StrSize(DestPath);\r
- NewSize += StrSize(Node->FileName) + SIZE_OF_EFI_FILE_INFO + sizeof(CHAR16);\r
- NewFileInfo = AllocateZeroPool(NewSize);\r
+ NewSize = StrSize (DestPath);\r
+ NewSize += StrSize (Node->FileName) + SIZE_OF_EFI_FILE_INFO + sizeof (CHAR16);\r
+ NewFileInfo = AllocateZeroPool (NewSize);\r
if (NewFileInfo == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);\r
Status = EFI_OUT_OF_RESOURCES;\r
} else {\r
- CopyMem(NewFileInfo, Node->Info, SIZE_OF_EFI_FILE_INFO);\r
+ CopyMem (NewFileInfo, Node->Info, SIZE_OF_EFI_FILE_INFO);\r
if (DestPath[0] != L'\\') {\r
- StrCpyS(NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof(CHAR16), L"\\");\r
- StrCatS(NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof(CHAR16), DestPath);\r
+ StrCpyS (NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof (CHAR16), L"\\");\r
+ StrCatS (NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof (CHAR16), DestPath);\r
} else {\r
- StrCpyS(NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof(CHAR16), DestPath);\r
+ StrCpyS (NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof (CHAR16), DestPath);\r
}\r
- Length = StrLen(NewFileInfo->FileName);\r
+\r
+ Length = StrLen (NewFileInfo->FileName);\r
if (Length > 0) {\r
Length--;\r
}\r
+\r
if (NewFileInfo->FileName[Length] == L'\\') {\r
if (Node->FileName[0] == L'\\') {\r
//\r
//\r
NewFileInfo->FileName[Length] = CHAR_NULL;\r
}\r
- StrCatS(NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof(CHAR16), Node->FileName);\r
+\r
+ StrCatS (NewFileInfo->FileName, (NewSize - SIZE_OF_EFI_FILE_INFO) / sizeof (CHAR16), Node->FileName);\r
}\r
- NewFileInfo->Size = SIZE_OF_EFI_FILE_INFO + StrSize(NewFileInfo->FileName);\r
+\r
+ NewFileInfo->Size = SIZE_OF_EFI_FILE_INFO + StrSize (NewFileInfo->FileName);\r
\r
//\r
// Perform the move operation\r
//\r
- Status = ShellSetFileInfo(Node->Handle, NewFileInfo);\r
+ Status = ShellSetFileInfo (Node->Handle, NewFileInfo);\r
\r
//\r
// Free the info object we used...\r
//\r
- FreePool(NewFileInfo);\r
+ FreePool (NewFileInfo);\r
}\r
\r
return (Status);\r
}\r
+\r
/**\r
function to take a list of files to move and a destination location and do\r
the verification and moving of those files to that location. This function\r
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed\r
**/\r
SHELL_STATUS\r
-ValidateAndMoveFiles(\r
- IN EFI_SHELL_FILE_INFO *FileList,\r
- OUT VOID **Resp,\r
- IN CONST CHAR16 *DestParameter\r
+ValidateAndMoveFiles (\r
+ IN EFI_SHELL_FILE_INFO *FileList,\r
+ OUT VOID **Resp,\r
+ IN CONST CHAR16 *DestParameter\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR16 *HiiOutput;\r
- CHAR16 *HiiResultOk;\r
- CHAR16 *DestPath;\r
- CHAR16 *FullDestPath;\r
- CONST CHAR16 *Cwd;\r
- CHAR16 *FullCwd;\r
- SHELL_STATUS ShellStatus;\r
- EFI_SHELL_FILE_INFO *Node;\r
- VOID *Response;\r
- UINT64 Attr;\r
- CHAR16 *CleanFilePathStr;\r
-\r
- ASSERT(FileList != NULL);\r
- ASSERT(DestParameter != NULL);\r
-\r
- DestPath = NULL;\r
- FullDestPath = NULL;\r
- Cwd = ShellGetCurrentDir(NULL);\r
- Response = *Resp;\r
- Attr = 0;\r
- CleanFilePathStr = NULL;\r
- FullCwd = NULL;\r
+ EFI_STATUS Status;\r
+ CHAR16 *HiiOutput;\r
+ CHAR16 *HiiResultOk;\r
+ CHAR16 *DestPath;\r
+ CHAR16 *FullDestPath;\r
+ CONST CHAR16 *Cwd;\r
+ CHAR16 *FullCwd;\r
+ SHELL_STATUS ShellStatus;\r
+ EFI_SHELL_FILE_INFO *Node;\r
+ VOID *Response;\r
+ UINT64 Attr;\r
+ CHAR16 *CleanFilePathStr;\r
+\r
+ ASSERT (FileList != NULL);\r
+ ASSERT (DestParameter != NULL);\r
+\r
+ DestPath = NULL;\r
+ FullDestPath = NULL;\r
+ Cwd = ShellGetCurrentDir (NULL);\r
+ Response = *Resp;\r
+ Attr = 0;\r
+ CleanFilePathStr = NULL;\r
+ FullCwd = NULL;\r
\r
if (Cwd != NULL) {\r
- FullCwd = AllocateZeroPool(StrSize(Cwd) + sizeof(CHAR16));\r
+ FullCwd = AllocateZeroPool (StrSize (Cwd) + sizeof (CHAR16));\r
if (FullCwd == NULL) {\r
return SHELL_OUT_OF_RESOURCES;\r
} else {\r
- StrCpyS(FullCwd, StrSize(Cwd)/sizeof(CHAR16)+1, Cwd);\r
- StrCatS(FullCwd, StrSize(Cwd)/sizeof(CHAR16)+1, L"\\");\r
+ StrCpyS (FullCwd, StrSize (Cwd)/sizeof (CHAR16)+1, Cwd);\r
+ StrCatS (FullCwd, StrSize (Cwd)/sizeof (CHAR16)+1, L"\\");\r
}\r
}\r
\r
Status = ShellLevel2StripQuotes (DestParameter, &CleanFilePathStr);\r
if (EFI_ERROR (Status)) {\r
- SHELL_FREE_NON_NULL(FullCwd);\r
+ SHELL_FREE_NON_NULL (FullCwd);\r
if (Status == EFI_OUT_OF_RESOURCES) {\r
return SHELL_OUT_OF_RESOURCES;\r
} else {\r
//\r
// Get and validate the destination location\r
//\r
- ShellStatus = GetDestinationLocation(CleanFilePathStr, &DestPath, FullCwd, (BOOLEAN)(FileList->Link.ForwardLink == FileList->Link.BackLink), &Attr);\r
+ ShellStatus = GetDestinationLocation (CleanFilePathStr, &DestPath, FullCwd, (BOOLEAN)(FileList->Link.ForwardLink == FileList->Link.BackLink), &Attr);\r
FreePool (CleanFilePathStr);\r
\r
if (ShellStatus != SHELL_SUCCESS) {\r
SHELL_FREE_NON_NULL (FullCwd);\r
return (ShellStatus);\r
}\r
- DestPath = PathCleanUpDirectories(DestPath);\r
+\r
+ DestPath = PathCleanUpDirectories (DestPath);\r
if (DestPath == NULL) {\r
FreePool (FullCwd);\r
return (SHELL_OUT_OF_RESOURCES);\r
\r
HiiOutput = HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MV_OUTPUT), NULL);\r
HiiResultOk = HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_GEN_RES_OK), NULL);\r
- if (HiiOutput == NULL || HiiResultOk == NULL) {\r
- SHELL_FREE_NON_NULL(DestPath);\r
- SHELL_FREE_NON_NULL(HiiOutput);\r
- SHELL_FREE_NON_NULL(HiiResultOk);\r
- SHELL_FREE_NON_NULL(FullCwd);\r
+ if ((HiiOutput == NULL) || (HiiResultOk == NULL)) {\r
+ SHELL_FREE_NON_NULL (DestPath);\r
+ SHELL_FREE_NON_NULL (HiiOutput);\r
+ SHELL_FREE_NON_NULL (HiiResultOk);\r
+ SHELL_FREE_NON_NULL (FullCwd);\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
\r
//\r
// Go through the list of files and directories to move...\r
//\r
- for (Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&FileList->Link)\r
- ; !IsNull(&FileList->Link, &Node->Link)\r
- ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&FileList->Link, &Node->Link)\r
- ){\r
- if (ShellGetExecutionBreakFlag()) {\r
+ for (Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&FileList->Link)\r
+ ; !IsNull (&FileList->Link, &Node->Link)\r
+ ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode (&FileList->Link, &Node->Link)\r
+ )\r
+ {\r
+ if (ShellGetExecutionBreakFlag ()) {\r
break;\r
}\r
\r
//\r
// These should never be NULL\r
//\r
- ASSERT(Node->FileName != NULL);\r
- ASSERT(Node->FullName != NULL);\r
- ASSERT(Node->Info != NULL);\r
+ ASSERT (Node->FileName != NULL);\r
+ ASSERT (Node->FullName != NULL);\r
+ ASSERT (Node->Info != NULL);\r
\r
//\r
// skip the directory traversing stuff...\r
//\r
- if (StrCmp(Node->FileName, L".") == 0 || StrCmp(Node->FileName, L"..") == 0) {\r
+ if ((StrCmp (Node->FileName, L".") == 0) || (StrCmp (Node->FileName, L"..") == 0)) {\r
continue;\r
}\r
\r
- SHELL_FREE_NON_NULL(FullDestPath);\r
+ SHELL_FREE_NON_NULL (FullDestPath);\r
FullDestPath = NULL;\r
- if (ShellIsDirectory(DestPath)==EFI_SUCCESS) {\r
- CreateFullDestPath((CONST CHAR16 **)&DestPath, &FullDestPath, Node->FileName);\r
+ if (ShellIsDirectory (DestPath) == EFI_SUCCESS) {\r
+ CreateFullDestPath ((CONST CHAR16 **)&DestPath, &FullDestPath, Node->FileName);\r
}\r
\r
//\r
// Validate that the move is valid\r
//\r
- if (!IsValidMove(Node->FullName, FullCwd, FullDestPath!=NULL? FullDestPath:DestPath, Node->Info->Attribute, Attr, Node->Status)) {\r
+ if (!IsValidMove (Node->FullName, FullCwd, (FullDestPath != NULL) ? FullDestPath : DestPath, Node->Info->Attribute, Attr, Node->Status)) {\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
continue;\r
}\r
\r
- ShellPrintEx(-1, -1, HiiOutput, Node->FullName, FullDestPath!=NULL? FullDestPath:DestPath);\r
+ ShellPrintEx (-1, -1, HiiOutput, Node->FullName, FullDestPath != NULL ? FullDestPath : DestPath);\r
\r
//\r
// See if destination exists\r
//\r
- if (!EFI_ERROR(ShellFileExists(FullDestPath!=NULL? FullDestPath:DestPath))) {\r
+ if (!EFI_ERROR (ShellFileExists ((FullDestPath != NULL) ? FullDestPath : DestPath))) {\r
if (Response == NULL) {\r
- ShellPromptForResponseHii(ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);\r
+ ShellPromptForResponseHii (ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);\r
}\r
+\r
if (Response == NULL) {\r
return SHELL_ABORTED;\r
}\r
- switch (*(SHELL_PROMPT_RESPONSE*)Response) {\r
+\r
+ switch (*(SHELL_PROMPT_RESPONSE *)Response) {\r
case ShellPromptResponseNo:\r
- FreePool(Response);\r
+ FreePool (Response);\r
Response = NULL;\r
continue;\r
case ShellPromptResponseCancel:\r
//\r
// indicate to stop everything\r
//\r
- SHELL_FREE_NON_NULL(FullCwd);\r
+ SHELL_FREE_NON_NULL (FullCwd);\r
return (SHELL_ABORTED);\r
case ShellPromptResponseAll:\r
*Resp = Response;\r
break;\r
case ShellPromptResponseYes:\r
- FreePool(Response);\r
+ FreePool (Response);\r
Response = NULL;\r
break;\r
default:\r
- FreePool(Response);\r
- SHELL_FREE_NON_NULL(FullCwd);\r
+ FreePool (Response);\r
+ SHELL_FREE_NON_NULL (FullCwd);\r
return SHELL_ABORTED;\r
}\r
- Status = ShellDeleteFileByName(FullDestPath!=NULL? FullDestPath:DestPath);\r
+\r
+ Status = ShellDeleteFileByName (FullDestPath != NULL ? FullDestPath : DestPath);\r
}\r
\r
- if (IsBetweenFileSystem(Node->FullName, FullCwd, DestPath)) {\r
- while (FullDestPath == NULL && DestPath != NULL && DestPath[0] != CHAR_NULL && DestPath[StrLen(DestPath) - 1] == L'\\') {\r
- DestPath[StrLen(DestPath) - 1] = CHAR_NULL;\r
+ if (IsBetweenFileSystem (Node->FullName, FullCwd, DestPath)) {\r
+ while (FullDestPath == NULL && DestPath != NULL && DestPath[0] != CHAR_NULL && DestPath[StrLen (DestPath) - 1] == L'\\') {\r
+ DestPath[StrLen (DestPath) - 1] = CHAR_NULL;\r
}\r
- Status = MoveBetweenFileSystems(Node, FullDestPath!=NULL? FullDestPath:DestPath, &Response);\r
+\r
+ Status = MoveBetweenFileSystems (Node, FullDestPath != NULL ? FullDestPath : DestPath, &Response);\r
} else {\r
- Status = MoveWithinFileSystems(Node, DestPath, &Response);\r
+ Status = MoveWithinFileSystems (Node, DestPath, &Response);\r
//\r
// Display error status\r
//\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"mv", Status);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"mv", Status);\r
}\r
}\r
\r
//\r
// Check our result\r
//\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
if (Status == EFI_SECURITY_VIOLATION) {\r
ShellStatus = SHELL_SECURITY_VIOLATION;\r
ShellStatus = SHELL_ACCESS_DENIED;\r
}\r
} else {\r
- ShellPrintEx(-1, -1, L"%s", HiiResultOk);\r
+ ShellPrintEx (-1, -1, L"%s", HiiResultOk);\r
}\r
-\r
} // main for loop\r
\r
- SHELL_FREE_NON_NULL(FullDestPath);\r
- SHELL_FREE_NON_NULL(DestPath);\r
- SHELL_FREE_NON_NULL(HiiOutput);\r
- SHELL_FREE_NON_NULL(HiiResultOk);\r
- SHELL_FREE_NON_NULL(FullCwd);\r
+ SHELL_FREE_NON_NULL (FullDestPath);\r
+ SHELL_FREE_NON_NULL (DestPath);\r
+ SHELL_FREE_NON_NULL (HiiOutput);\r
+ SHELL_FREE_NON_NULL (HiiResultOk);\r
+ SHELL_FREE_NON_NULL (FullCwd);\r
return (ShellStatus);\r
}\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- CHAR16 *Cwd;\r
- UINTN CwdSize;\r
- SHELL_STATUS ShellStatus;\r
- UINTN ParamCount;\r
- UINTN LoopCounter;\r
- EFI_SHELL_FILE_INFO *FileList;\r
- VOID *Response;\r
-\r
- ProblemParam = NULL;\r
- ShellStatus = SHELL_SUCCESS;\r
- ParamCount = 0;\r
- FileList = NULL;\r
- Response = NULL;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ CHAR16 *Cwd;\r
+ UINTN CwdSize;\r
+ SHELL_STATUS ShellStatus;\r
+ UINTN ParamCount;\r
+ UINTN LoopCounter;\r
+ EFI_SHELL_FILE_INFO *FileList;\r
+ VOID *Response;\r
+\r
+ ProblemParam = NULL;\r
+ ShellStatus = SHELL_SUCCESS;\r
+ ParamCount = 0;\r
+ FileList = NULL;\r
+ Response = NULL;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);\r
- if (EFI_ERROR(Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mv", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mv", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
//\r
// check for "-?"\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-?")) {\r
- ASSERT(FALSE);\r
+ if (ShellCommandLineGetFlag (Package, L"-?")) {\r
+ ASSERT (FALSE);\r
}\r
\r
- switch (ParamCount = ShellCommandLineGetCount(Package)) {\r
+ switch (ParamCount = ShellCommandLineGetCount (Package)) {\r
case 0:\r
case 1:\r
//\r
// we have insufficient parameters\r
//\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mv");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mv");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
break;\r
case 2:\r
//\r
// must have valid CWD for single parameter...\r
//\r
- if (ShellGetCurrentDir(NULL) == NULL){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"mv");\r
+ if (ShellGetCurrentDir (NULL) == NULL) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"mv");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, 1), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);\r
- if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1));\r
+ Status = ShellOpenFileMetaArg ((CHAR16 *)ShellCommandLineGetRawValue (Package, 1), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);\r
+ if ((FileList == NULL) || IsListEmpty (&FileList->Link) || EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue (Package, 1));\r
ShellStatus = SHELL_NOT_FOUND;\r
- } else {\r
+ } else {\r
//\r
// ValidateAndMoveFiles will report errors to the screen itself\r
//\r
- CwdSize = StrSize(ShellGetCurrentDir(NULL)) + sizeof(CHAR16);\r
- Cwd = AllocateZeroPool(CwdSize);\r
+ CwdSize = StrSize (ShellGetCurrentDir (NULL)) + sizeof (CHAR16);\r
+ Cwd = AllocateZeroPool (CwdSize);\r
if (Cwd == NULL) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle, L"mv");\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
\r
break;\r
default:\r
- ///@todo make sure this works with error half way through and continues...\r
- for (ParamCount--, LoopCounter = 1 ; LoopCounter < ParamCount ; LoopCounter++) {\r
- if (ShellGetExecutionBreakFlag()) {\r
+ /// @todo make sure this works with error half way through and continues...\r
+ for (ParamCount--, LoopCounter = 1; LoopCounter < ParamCount; LoopCounter++) {\r
+ if (ShellGetExecutionBreakFlag ()) {\r
break;\r
}\r
- Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, LoopCounter), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);\r
- if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, LoopCounter));\r
+\r
+ Status = ShellOpenFileMetaArg ((CHAR16 *)ShellCommandLineGetRawValue (Package, LoopCounter), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);\r
+ if ((FileList == NULL) || IsListEmpty (&FileList->Link) || EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue (Package, LoopCounter));\r
ShellStatus = SHELL_NOT_FOUND;\r
- } else {\r
+ } else {\r
//\r
// ValidateAndMoveFiles will report errors to the screen itself\r
// Only change ShellStatus if it's sucessful\r
//\r
if (ShellStatus == SHELL_SUCCESS) {\r
- ShellStatus = ValidateAndMoveFiles(FileList, &Response, ShellCommandLineGetRawValue(Package, ParamCount));\r
+ ShellStatus = ValidateAndMoveFiles (FileList, &Response, ShellCommandLineGetRawValue (Package, ParamCount));\r
} else {\r
- ValidateAndMoveFiles(FileList, &Response, ShellCommandLineGetRawValue(Package, ParamCount));\r
+ ValidateAndMoveFiles (FileList, &Response, ShellCommandLineGetRawValue (Package, ParamCount));\r
}\r
}\r
- if (FileList != NULL && !IsListEmpty(&FileList->Link)) {\r
- Status = ShellCloseFileMetaArg(&FileList);\r
- if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {\r
+\r
+ if ((FileList != NULL) && !IsListEmpty (&FileList->Link)) {\r
+ Status = ShellCloseFileMetaArg (&FileList);\r
+ if (EFI_ERROR (Status) && (ShellStatus == SHELL_SUCCESS)) {\r
ShellStatus = SHELL_ACCESS_DENIED;\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue(Package, 1), ShellStatus|MAX_BIT);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, L"mv", ShellCommandLineGetRawValue (Package, 1), ShellStatus|MAX_BIT);\r
}\r
}\r
}\r
+\r
break;\r
} // switch on parameter count\r
\r
if (FileList != NULL) {\r
- ShellCloseFileMetaArg(&FileList);\r
+ ShellCloseFileMetaArg (&FileList);\r
}\r
\r
//\r
ShellCommandLineFreeVarList (Package);\r
}\r
\r
- SHELL_FREE_NON_NULL(Response);\r
+ SHELL_FREE_NON_NULL (Response);\r
\r
- if (ShellGetExecutionBreakFlag()) {\r
+ if (ShellGetExecutionBreakFlag ()) {\r
return (SHELL_ABORTED);\r
}\r
\r