@retval SHELL_SUCCESS The operation was sucessful.\r
**/\r
SHELL_STATUS\r
-HandleVol(\r
- IN CONST CHAR16 *Path,\r
- IN CONST BOOLEAN Delete,\r
- IN CONST CHAR16 *Name OPTIONAL\r
+HandleVol (\r
+ IN CONST CHAR16 *Path,\r
+ IN CONST BOOLEAN Delete,\r
+ IN CONST CHAR16 *Name OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
UINTN Size1;\r
UINTN Size2;\r
\r
- ShellStatus = SHELL_SUCCESS;\r
+ ShellStatus = SHELL_SUCCESS;\r
\r
if (\r
- Name != NULL && (\r
- StrStr(Name, L"%") != NULL ||\r
- StrStr(Name, L"^") != NULL ||\r
- StrStr(Name, L"*") != NULL ||\r
- StrStr(Name, L"+") != NULL ||\r
- StrStr(Name, L"=") != NULL ||\r
- StrStr(Name, L"[") != NULL ||\r
- StrStr(Name, L"]") != NULL ||\r
- StrStr(Name, L"|") != NULL ||\r
- StrStr(Name, L":") != NULL ||\r
- StrStr(Name, L";") != NULL ||\r
- StrStr(Name, L"\"") != NULL ||\r
- StrStr(Name, L"<") != NULL ||\r
- StrStr(Name, L">") != NULL ||\r
- StrStr(Name, L"?") != NULL ||\r
- StrStr(Name, L"/") != NULL ||\r
- StrStr(Name, L" ") != NULL )\r
- ){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"vol", Name);\r
+ (Name != NULL) && (\r
+ (StrStr (Name, L"%") != NULL) ||\r
+ (StrStr (Name, L"^") != NULL) ||\r
+ (StrStr (Name, L"*") != NULL) ||\r
+ (StrStr (Name, L"+") != NULL) ||\r
+ (StrStr (Name, L"=") != NULL) ||\r
+ (StrStr (Name, L"[") != NULL) ||\r
+ (StrStr (Name, L"]") != NULL) ||\r
+ (StrStr (Name, L"|") != NULL) ||\r
+ (StrStr (Name, L":") != NULL) ||\r
+ (StrStr (Name, L";") != NULL) ||\r
+ (StrStr (Name, L"\"") != NULL) ||\r
+ (StrStr (Name, L"<") != NULL) ||\r
+ (StrStr (Name, L">") != NULL) ||\r
+ (StrStr (Name, L"?") != NULL) ||\r
+ (StrStr (Name, L"/") != NULL) ||\r
+ (StrStr (Name, L" ") != NULL))\r
+ )\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"vol", Name);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- Status = gEfiShellProtocol->OpenFileByName(\r
- Path,\r
- &ShellFileHandle,\r
- Name != NULL?EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE:EFI_FILE_MODE_READ);\r
+ Status = gEfiShellProtocol->OpenFileByName (\r
+ Path,\r
+ &ShellFileHandle,\r
+ Name != NULL ? EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE : EFI_FILE_MODE_READ\r
+ );\r
\r
- if (EFI_ERROR(Status) || ShellFileHandle == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"vol", Path);\r
+ if (EFI_ERROR (Status) || (ShellFileHandle == NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"vol", Path);\r
return (SHELL_ACCESS_DENIED);\r
}\r
\r
//\r
SysInfo = NULL;\r
SysInfoSize = 0;\r
- EfiFpHandle = ConvertShellHandleToEfiFileProtocol(ShellFileHandle);\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\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
+ SysInfo = AllocateZeroPool (SysInfoSize);\r
+ Status = EfiFpHandle->GetInfo (\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
}\r
\r
- ASSERT(SysInfo != NULL);\r
+ ASSERT (SysInfo != NULL);\r
\r
if (Delete) {\r
- *((CHAR16 *) SysInfo->VolumeLabel) = CHAR_NULL;\r
- SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize(SysInfo->VolumeLabel);\r
- Status = EfiFpHandle->SetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- (UINTN)SysInfo->Size,\r
- SysInfo);\r
+ *((CHAR16 *)SysInfo->VolumeLabel) = CHAR_NULL;\r
+ SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (SysInfo->VolumeLabel);\r
+ Status = EfiFpHandle->SetInfo (\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ (UINTN)SysInfo->Size,\r
+ SysInfo\r
+ );\r
} else if (Name != NULL) {\r
- Size1 = StrSize(Name);\r
- Size2 = StrSize(SysInfo->VolumeLabel);\r
+ Size1 = StrSize (Name);\r
+ Size2 = StrSize (SysInfo->VolumeLabel);\r
if (Size1 > Size2) {\r
- SysInfo = ReallocatePool((UINTN)SysInfo->Size, (UINTN)SysInfo->Size + Size1 - Size2, SysInfo);\r
+ SysInfo = ReallocatePool ((UINTN)SysInfo->Size, (UINTN)SysInfo->Size + Size1 - Size2, SysInfo);\r
if (SysInfo == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle, L"vol");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle, L"vol");\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
}\r
}\r
+\r
if (SysInfo != NULL) {\r
- StrCpyS ( (CHAR16 *) SysInfo->VolumeLabel,\r
- (Size1>Size2? Size1/sizeof(CHAR16) : Size2/sizeof(CHAR16)),\r
- Name\r
- );\r
+ StrCpyS (\r
+ (CHAR16 *)SysInfo->VolumeLabel,\r
+ (Size1 > Size2 ? Size1/sizeof (CHAR16) : Size2/sizeof (CHAR16)),\r
+ Name\r
+ );\r
SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;\r
- Status = EfiFpHandle->SetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- (UINTN)SysInfo->Size,\r
- SysInfo);\r
+ Status = EfiFpHandle->SetInfo (\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ (UINTN)SysInfo->Size,\r
+ SysInfo\r
+ );\r
}\r
}\r
\r
- FreePool(SysInfo);\r
+ FreePool (SysInfo);\r
\r
- if (Delete || Name != NULL) {\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"vol", Path);\r
+ if (Delete || (Name != NULL)) {\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"vol", Path);\r
ShellStatus = SHELL_ACCESS_DENIED;\r
}\r
}\r
\r
SysInfoSize = 0;\r
- SysInfo = NULL;\r
+ SysInfo = NULL;\r
\r
- Status = EfiFpHandle->GetInfo(\r
- EfiFpHandle,\r
- &gEfiFileSystemInfoGuid,\r
- &SysInfoSize,\r
- SysInfo);\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
+ SysInfo = AllocateZeroPool (SysInfoSize);\r
+ Status = EfiFpHandle->GetInfo (\r
+ EfiFpHandle,\r
+ &gEfiFileSystemInfoGuid,\r
+ &SysInfoSize,\r
+ SysInfo\r
+ );\r
}\r
\r
- gEfiShellProtocol->CloseFile(ShellFileHandle);\r
+ gEfiShellProtocol->CloseFile (ShellFileHandle);\r
\r
- ASSERT(SysInfo != NULL);\r
+ ASSERT (SysInfo != NULL);\r
\r
if (SysInfo != NULL) {\r
//\r
STRING_TOKEN (STR_VOL_VOLINFO),\r
gShellLevel2HiiHandle,\r
SysInfo->VolumeLabel,\r
- SysInfo->ReadOnly?L"r":L"rw",\r
+ SysInfo->ReadOnly ? L"r" : L"rw",\r
SysInfo->VolumeSize,\r
SysInfo->FreeSpace,\r
SysInfo->BlockSize\r
- );\r
- SHELL_FREE_NON_NULL(SysInfo);\r
+ );\r
+ SHELL_FREE_NON_NULL (SysInfo);\r
}\r
\r
return (ShellStatus);\r
}\r
\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-d", TypeFlag},\r
- {L"-n", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-d", TypeFlag },\r
+ { L"-n", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'Vol' command.\r
UINTN Length;\r
CONST CHAR16 *NewName;\r
\r
- Length = 0;\r
- ProblemParam = NULL;\r
- ShellStatus = SHELL_SUCCESS;\r
- PathName = NULL;\r
- CurDir = NULL;\r
- FullPath = NULL;\r
+ Length = 0;\r
+ ProblemParam = NULL;\r
+ ShellStatus = SHELL_SUCCESS;\r
+ PathName = NULL;\r
+ CurDir = NULL;\r
+ FullPath = 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
// Fix local copies of the protocol pointers\r
//\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (ParamList, &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"vol", 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"vol", 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
- if (ShellCommandLineGetCount(Package) > 2) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"vol");\r
+ if (ShellCommandLineGetCount (Package) > 2) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"vol");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- PathName = ShellCommandLineGetRawValue(Package, 1);\r
+ PathName = ShellCommandLineGetRawValue (Package, 1);\r
if (PathName == NULL) {\r
- CurDir = gEfiShellProtocol->GetCurDir(NULL);\r
+ CurDir = gEfiShellProtocol->GetCurDir (NULL);\r
if (CurDir == NULL) {\r
ShellStatus = SHELL_NOT_FOUND;\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"vol");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle, L"vol");\r
} else {\r
PathName = CurDir;\r
}\r
}\r
+\r
if (PathName != NULL) {\r
- TempSpot = StrStr(PathName, L":");\r
+ TempSpot = StrStr (PathName, L":");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
- TempSpot = StrStr(PathName, L"\\");\r
+\r
+ TempSpot = StrStr (PathName, L"\\");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
- StrnCatGrow(&FullPath, &Length, PathName, 0);\r
- StrnCatGrow(&FullPath, &Length, L":\\", 0);\r
- DeleteMode = ShellCommandLineGetFlag(Package, L"-d");\r
- NewName = ShellCommandLineGetValue(Package, L"-n");\r
- if (DeleteMode && ShellCommandLineGetFlag(Package, L"-n")) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellLevel2HiiHandle, L"vol", L"-d", L"-n");\r
+\r
+ StrnCatGrow (&FullPath, &Length, PathName, 0);\r
+ StrnCatGrow (&FullPath, &Length, L":\\", 0);\r
+ DeleteMode = ShellCommandLineGetFlag (Package, L"-d");\r
+ NewName = ShellCommandLineGetValue (Package, L"-n");\r
+ if (DeleteMode && ShellCommandLineGetFlag (Package, L"-n")) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellLevel2HiiHandle, L"vol", L"-d", L"-n");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetFlag(Package, L"-n") && NewName == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"vol", L"-n");\r
+ } else if (ShellCommandLineGetFlag (Package, L"-n") && (NewName == NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"vol", L"-n");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (NewName != NULL && StrLen(NewName) > 11) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"vol", NewName, L"-n");\r
+ } else if ((NewName != NULL) && (StrLen (NewName) > 11)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"vol", NewName, L"-n");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (ShellStatus == SHELL_SUCCESS) {\r
- ShellStatus = HandleVol(\r
- FullPath,\r
- DeleteMode,\r
- NewName\r
- );\r
+ ShellStatus = HandleVol (\r
+ FullPath,\r
+ DeleteMode,\r
+ NewName\r
+ );\r
}\r
}\r
}\r
}\r
\r
- SHELL_FREE_NON_NULL(FullPath);\r
+ SHELL_FREE_NON_NULL (FullPath);\r
\r
//\r
// free the command line package\r
projects / mirror_edk2.git / blobdiff