\r
VfrCompiler main class and main function.\r
\r
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
Status = EFI_SUCCESS;\r
SetUtilityName ((CHAR8*) PROGRAM_NAME);\r
\r
- mOptions.VfrFileName[0] = '\0';\r
- mOptions.RecordListFile[0] = '\0';\r
+ mOptions.VfrFileName = NULL;\r
+ mOptions.RecordListFile = NULL;\r
mOptions.CreateRecordListFile = FALSE;\r
mOptions.CreateIfrPkgFile = FALSE;\r
- mOptions.PkgOutputFileName[0] = '\0';\r
- mOptions.COutputFileName[0] = '\0';\r
- mOptions.OutputDirectory[0] = '\0';\r
- mOptions.PreprocessorOutputFileName[0] = '\0';\r
- mOptions.VfrBaseFileName[0] = '\0';\r
+ mOptions.PkgOutputFileName = NULL;\r
+ mOptions.COutputFileName = NULL;\r
+ mOptions.OutputDirectory = NULL;\r
+ mOptions.PreprocessorOutputFileName = NULL;\r
+ mOptions.VfrBaseFileName = NULL;\r
mOptions.IncludePaths = NULL;\r
mOptions.SkipCPreprocessor = TRUE;\r
mOptions.CPreprocessorOptions = NULL;\r
DebugError (NULL, 0, 1001, "Missing option", "-o missing output directory name");\r
goto Fail;\r
}\r
+\r
+ mOptions.OutputDirectory = (CHAR8 *) malloc (strlen (Argv[Index]) + strlen ("\\") + 1);\r
+ if (mOptions.OutputDirectory == NULL) {\r
+ DebugError (NULL, 0, 4001, "Resource: memory can't be allocated", NULL);\r
+ goto Fail;\r
+ }\r
strcpy (mOptions.OutputDirectory, Argv[Index]);\r
\r
CHAR8 lastChar = mOptions.OutputDirectory[strlen(mOptions.OutputDirectory) - 1];\r
strcat (mOptions.OutputDirectory, "\\");\r
}\r
}\r
- DebugMsg (NULL, 0, 9, (CHAR8 *) "Output Directory", mOptions.OutputDirectory);\r
+ DebugMsg (NULL, 0, 9, (CHAR8 *) "Output Directory", (CHAR8 *) "%s", mOptions.OutputDirectory);\r
} else if (stricmp(Argv[Index], "-b") == 0 || stricmp(Argv[Index], "--create-ifr-package") == 0 || stricmp(Argv[Index], "-ibin") == 0) {\r
mOptions.CreateIfrPkgFile = TRUE;\r
} else if (stricmp(Argv[Index], "-n") == 0 || stricmp(Argv[Index], "--no-pre-processing") == 0 || stricmp(Argv[Index], "-nopp") == 0) {\r
goto Fail;\r
}\r
gCVfrStringDB.SetStringFileName(Argv[Index]);\r
- DebugMsg (NULL, 0, 9, (CHAR8 *) "Input string file path", Argv[Index]);\r
+ DebugMsg (NULL, 0, 9, (CHAR8 *) "Input string file path", (CHAR8 *) "%s", Argv[Index]);\r
} else if ((stricmp (Argv[Index], "-g") == 0) || (stricmp (Argv[Index], "--guid") == 0)) {\r
Index++;\r
Status = StringToGuid (Argv[Index], &mOptions.OverrideClassGuid);\r
DebugError (NULL, 0, 1001, "Missing option", "VFR file name is not specified.");\r
goto Fail;\r
} else {\r
+ mOptions.VfrFileName = (CHAR8 *) malloc (strlen (Argv[Index]) + 1);\r
+ if (mOptions.VfrFileName == NULL) {\r
+ DebugError (NULL, 0, 4001, "Resource: memory can't be allocated", NULL);\r
+ goto Fail;\r
+ }\r
strcpy (mOptions.VfrFileName, Argv[Index]);\r
+\r
+ if (mOptions.OutputDirectory == NULL) {\r
+ mOptions.OutputDirectory = (CHAR8 *) malloc (1);\r
+ if (mOptions.OutputDirectory == NULL) {\r
+ DebugError (NULL, 0, 4001, "Resource: memory can't be allocated", NULL);\r
+ goto Fail;\r
+ }\r
+ mOptions.OutputDirectory[0] = '\0';\r
+ }\r
}\r
\r
if (SetBaseFileName() != 0) {\r
Fail:\r
SET_RUN_STATUS (STATUS_DEAD);\r
\r
- mOptions.VfrFileName[0] = '\0';\r
- mOptions.RecordListFile[0] = '\0';\r
mOptions.CreateRecordListFile = FALSE;\r
mOptions.CreateIfrPkgFile = FALSE;\r
- mOptions.PkgOutputFileName[0] = '\0';\r
- mOptions.COutputFileName[0] = '\0';\r
- mOptions.OutputDirectory[0] = '\0';\r
- mOptions.PreprocessorOutputFileName[0] = '\0';\r
- mOptions.VfrBaseFileName[0] = '\0';\r
+\r
+ if (mOptions.VfrFileName != NULL) {\r
+ free (mOptions.VfrFileName);\r
+ mOptions.VfrFileName = NULL;\r
+ }\r
+ if (mOptions.VfrBaseFileName != NULL) {\r
+ free (mOptions.VfrBaseFileName);\r
+ mOptions.VfrBaseFileName = NULL;\r
+ }\r
+ if (mOptions.OutputDirectory != NULL) {\r
+ free (mOptions.OutputDirectory);\r
+ mOptions.OutputDirectory = NULL;\r
+ }\r
+ if (mOptions.PkgOutputFileName != NULL) {\r
+ free (mOptions.PkgOutputFileName);\r
+ mOptions.PkgOutputFileName = NULL;\r
+ }\r
+ if (mOptions.COutputFileName != NULL) {\r
+ free (mOptions.COutputFileName);\r
+ mOptions.COutputFileName = NULL;\r
+ }\r
+ if (mOptions.PreprocessorOutputFileName != NULL) {\r
+ free (mOptions.PreprocessorOutputFileName);\r
+ mOptions.PreprocessorOutputFileName = NULL;\r
+ }\r
+ if (mOptions.RecordListFile != NULL) {\r
+ free (mOptions.RecordListFile);\r
+ mOptions.RecordListFile = NULL;\r
+ }\r
if (mOptions.IncludePaths != NULL) {\r
delete mOptions.IncludePaths;\r
mOptions.IncludePaths = NULL;\r
{\r
CHAR8 *pFileName, *pPath, *pExt;\r
\r
- if (mOptions.VfrFileName[0] == '\0') {\r
+ if (mOptions.VfrFileName == NULL) {\r
return -1;\r
}\r
\r
return -1;\r
}\r
\r
- strncpy (mOptions.VfrBaseFileName, pFileName, pExt - pFileName);\r
- mOptions.VfrBaseFileName[pExt - pFileName] = '\0';\r
+ *pExt = '\0';\r
+\r
+ mOptions.VfrBaseFileName = (CHAR8 *) malloc (strlen (pFileName) + 1);\r
+ if (mOptions.VfrBaseFileName == NULL) {\r
+ *pExt = '.';\r
+ return -1;\r
+ }\r
+\r
+ strcpy (mOptions.VfrBaseFileName, pFileName);\r
+ *pExt = '.';\r
\r
return 0;\r
}\r
VOID\r
)\r
{\r
- if (mOptions.VfrBaseFileName[0] == '\0') {\r
+ INTN Length;\r
+\r
+ if (mOptions.VfrBaseFileName == NULL) {\r
+ return -1;\r
+ }\r
+\r
+ Length = strlen (mOptions.OutputDirectory) +\r
+ strlen (mOptions.VfrBaseFileName) +\r
+ strlen (VFR_PACKAGE_FILENAME_EXTENSION) +\r
+ 1;\r
+\r
+ mOptions.PkgOutputFileName = (CHAR8 *) malloc (Length);\r
+ if (mOptions.PkgOutputFileName == NULL) {\r
return -1;\r
}\r
\r
VOID\r
)\r
{\r
- if (mOptions.VfrBaseFileName[0] == '\0') {\r
+ INTN Length;\r
+\r
+ if (mOptions.VfrBaseFileName == NULL) {\r
+ return -1;\r
+ }\r
+\r
+ Length = strlen (mOptions.OutputDirectory) +\r
+ strlen (mOptions.VfrBaseFileName) +\r
+ strlen (".c") +\r
+ 1;\r
+\r
+ mOptions.COutputFileName = (CHAR8 *) malloc (Length);\r
+ if (mOptions.COutputFileName == NULL) {\r
return -1;\r
}\r
\r
VOID\r
)\r
{\r
- if (mOptions.VfrBaseFileName[0] == '\0') {\r
+ INTN Length;\r
+\r
+ if (mOptions.VfrBaseFileName == NULL) {\r
+ return -1;\r
+ }\r
+\r
+ Length = strlen (mOptions.OutputDirectory) +\r
+ strlen (mOptions.VfrBaseFileName) +\r
+ strlen (VFR_PREPROCESS_FILENAME_EXTENSION) +\r
+ 1;\r
+\r
+ mOptions.PreprocessorOutputFileName = (CHAR8 *) malloc (Length);\r
+ if (mOptions.PreprocessorOutputFileName == NULL) {\r
return -1;\r
}\r
\r
VOID\r
)\r
{\r
- if (mOptions.VfrBaseFileName[0] == '\0') {\r
+ INTN Length;\r
+\r
+ if (mOptions.VfrBaseFileName == NULL) {\r
+ return -1;\r
+ }\r
+\r
+ Length = strlen (mOptions.OutputDirectory) +\r
+ strlen (mOptions.VfrBaseFileName) +\r
+ strlen (VFR_RECORDLIST_FILENAME_EXTENSION) +\r
+ 1;\r
+\r
+ mOptions.RecordListFile = (CHAR8 *) malloc (Length);\r
+ if (mOptions.RecordListFile == NULL) {\r
return -1;\r
}\r
\r
VOID\r
)\r
{\r
+ if (mOptions.VfrFileName != NULL) {\r
+ free (mOptions.VfrFileName);\r
+ mOptions.VfrFileName = NULL;\r
+ }\r
+\r
+ if (mOptions.VfrBaseFileName != NULL) {\r
+ free (mOptions.VfrBaseFileName);\r
+ mOptions.VfrBaseFileName = NULL;\r
+ }\r
+\r
+ if (mOptions.OutputDirectory != NULL) {\r
+ free (mOptions.OutputDirectory);\r
+ mOptions.OutputDirectory = NULL;\r
+ }\r
+\r
+ if (mOptions.PkgOutputFileName != NULL) {\r
+ free (mOptions.PkgOutputFileName);\r
+ mOptions.PkgOutputFileName = NULL;\r
+ }\r
+\r
+ if (mOptions.COutputFileName != NULL) {\r
+ free (mOptions.COutputFileName);\r
+ mOptions.COutputFileName = NULL;\r
+ }\r
+\r
+ if (mOptions.PreprocessorOutputFileName != NULL) {\r
+ free (mOptions.PreprocessorOutputFileName);\r
+ mOptions.PreprocessorOutputFileName = NULL;\r
+ }\r
+\r
+ if (mOptions.RecordListFile != NULL) {\r
+ free (mOptions.RecordListFile);\r
+ mOptions.RecordListFile = NULL;\r
+ }\r
+\r
if (mOptions.IncludePaths != NULL) {\r
delete mOptions.IncludePaths;\r
mOptions.IncludePaths = NULL;\r
}\r
\r
if ((pVfrFile = fopen (LongFilePath (mOptions.VfrFileName), "r")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening the input VFR file", mOptions.VfrFileName);\r
+ DebugError (NULL, 0, 0001, "Error opening the input VFR file", "%s", mOptions.VfrFileName);\r
goto Fail;\r
}\r
fclose (pVfrFile);\r
goto Fail;\r
}\r
\r
- delete PreProcessCmd;\r
+ delete[] PreProcessCmd;\r
\r
Out:\r
SET_RUN_STATUS (STATUS_PREPROCESSED);\r
if (!IS_RUN_STATUS(STATUS_DEAD)) {\r
SET_RUN_STATUS (STATUS_FAILED);\r
}\r
- delete PreProcessCmd;\r
+ delete[] PreProcessCmd;\r
}\r
\r
extern UINT8 VfrParserStart (IN FILE *, IN INPUT_INFO_TO_SYNTAX *);\r
gCVfrErrorHandle.SetWarningAsError(mOptions.WarningAsError);\r
\r
if ((pInFile = fopen (LongFilePath (InFileName), "r")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening the input file", InFileName);\r
+ DebugError (NULL, 0, 0001, "Error opening the input file", "%s", InFileName);\r
goto Fail;\r
}\r
\r
}\r
\r
fclose (pInFile);\r
+ pInFile = NULL;\r
\r
if (gCFormPkg.HavePendingUnassigned () == TRUE) {\r
gCFormPkg.PendingAssignPrintAll ();\r
\r
if (mOptions.CreateIfrPkgFile == TRUE) {\r
if ((pFile = fopen (LongFilePath (mOptions.PkgOutputFileName), "wb")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening file", mOptions.PkgOutputFileName);\r
+ DebugError (NULL, 0, 0001, "Error opening file", "%s", mOptions.PkgOutputFileName);\r
goto Fail;\r
}\r
if (gCFormPkg.BuildPkg (pFile, &gRBuffer) != VFR_RETURN_SUCCESS) {\r
\r
if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) {\r
if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening output C file", mOptions.COutputFileName);\r
+ DebugError (NULL, 0, 0001, "Error opening output C file", "%s", mOptions.COutputFileName);\r
goto Fail;\r
}\r
\r
\r
InFileName = (mOptions.SkipCPreprocessor == TRUE) ? mOptions.VfrFileName : mOptions.PreprocessorOutputFileName;\r
\r
- if (mOptions.CreateRecordListFile == TRUE) {\r
+ if (mOptions.CreateRecordListFile == TRUE && InFileName != NULL && mOptions.RecordListFile != NULL) {\r
if ((InFileName[0] == '\0') || (mOptions.RecordListFile[0] == '\0')) {\r
return;\r
}\r
\r
if ((pInFile = fopen (LongFilePath (InFileName), "r")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening the input VFR preprocessor output file", InFileName);\r
+ DebugError (NULL, 0, 0001, "Error opening the input VFR preprocessor output file", "%s", InFileName);\r
return;\r
}\r
\r
if ((pOutFile = fopen (LongFilePath (mOptions.RecordListFile), "w")) == NULL) {\r
- DebugError (NULL, 0, 0001, "Error opening the record list file", mOptions.RecordListFile);\r
+ DebugError (NULL, 0, 0001, "Error opening the record list file", "%s", mOptions.RecordListFile);\r
goto Err1;\r
}\r
\r
projects / mirror_edk2.git / blobdiff