#include "menu.h"
#include "config.h"
#include "screen.h"
-#include "refit_call_wrapper.h"
+#include "../include/refit_call_wrapper.h"
// constants
-#define CONFIG_FILE_NAME L"refind.conf"
-#define LINUX_OPTIONS_FILENAMES L"refind_linux.conf,refind-linux.conf,linux.conf"
+#define LINUX_OPTIONS_FILENAMES L"refind_linux.conf,refind-linux.conf"
#define MAXCONFIGFILESIZE (128*1024)
#define ENCODING_ISO8859_1 (0)
// read a file into a buffer
//
-static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_FILE *File)
+EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, IN CHAR16 *FileName, IN OUT REFIT_FILE *File, OUT UINTN *size)
{
EFI_STATUS Status;
EFI_FILE_HANDLE FileHandle;
EFI_FILE_INFO *FileInfo;
UINT64 ReadSize;
+ CHAR16 Message[256];
File->Buffer = NULL;
File->BufferSize = 0;
// read the file, allocating a buffer on the way
Status = refit_call5_wrapper(BaseDir->Open, BaseDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
- if (CheckError(Status, L"while loading the configuration file"))
+ SPrint(Message, 255, L"while loading the file '%s'", FileName);
+ if (CheckError(Status, Message))
return Status;
FileInfo = LibFileInfo(FileHandle);
return EFI_LOAD_ERROR;
}
ReadSize = FileInfo->FileSize;
- if (ReadSize > MAXCONFIGFILESIZE)
- ReadSize = MAXCONFIGFILESIZE;
FreePool(FileInfo);
- File->BufferSize = (UINTN)ReadSize; // was limited to a few K before, so this is safe
+ File->BufferSize = (UINTN)ReadSize;
File->Buffer = AllocatePool(File->BufferSize);
+ if (File->Buffer == NULL) {
+ size = 0;
+ return EFI_OUT_OF_RESOURCES;
+ } else {
+ *size = File->BufferSize;
+ } // if/else
Status = refit_call3_wrapper(FileHandle->Read, FileHandle, &File->BufferSize, File->Buffer);
- if (CheckError(Status, L"while loading the configuration file")) {
- FreePool(File->Buffer);
+ if (CheckError(Status, Message)) {
+ MyFreePool(File->Buffer);
File->Buffer = NULL;
refit_call1_wrapper(FileHandle->Close, FileHandle);
return Status;
}
// TODO: detect other encodings as they are implemented
}
-
+
return EFI_SUCCESS;
}
{
CHAR16 *Line, *q;
UINTN LineLength;
-
+
if (File->Buffer == NULL)
return NULL;
-
+
if (File->Encoding == ENCODING_ISO8859_1 || File->Encoding == ENCODING_UTF8) {
-
+
CHAR8 *p, *LineStart, *LineEnd;
-
+
p = File->Current8Ptr;
if (p >= File->End8Ptr)
return NULL;
-
+
LineStart = p;
for (; p < File->End8Ptr; p++)
if (*p == 13 || *p == 10)
if (*p != 13 && *p != 10)
break;
File->Current8Ptr = p;
-
+
LineLength = (UINTN)(LineEnd - LineStart) + 1;
Line = AllocatePool(LineLength * sizeof(CHAR16));
if (Line == NULL)
return NULL;
-
+
q = Line;
if (File->Encoding == ENCODING_ISO8859_1) {
for (p = LineStart; p < LineEnd; )
*q++ = *p++;
}
*q = 0;
-
+
} else if (File->Encoding == ENCODING_UTF16_LE) {
-
+
CHAR16 *p, *LineStart, *LineEnd;
-
+
p = File->Current16Ptr;
if (p >= File->End16Ptr)
return NULL;
-
+
LineStart = p;
for (; p < File->End16Ptr; p++)
if (*p == 13 || *p == 10)
if (*p != 13 && *p != 10)
break;
File->Current16Ptr = p;
-
+
LineLength = (UINTN)(LineEnd - LineStart) + 1;
Line = AllocatePool(LineLength * sizeof(CHAR16));
if (Line == NULL)
return NULL;
-
+
for (p = LineStart, q = Line; p < LineEnd; )
*q++ = *p++;
*q = 0;
-
+
} else
return NULL; // unsupported encoding
-
+
return Line;
}
+// Returns FALSE if *p points to the end of a token, TRUE otherwise.
+// Also modifies *p **IF** the first and second characters are both
+// quotes ('"'); it deletes one of them.
+static BOOLEAN KeepReading(IN OUT CHAR16 *p, IN OUT BOOLEAN *IsQuoted) {
+ BOOLEAN MoreToRead = FALSE;
+ CHAR16 *Temp = NULL;
+// while (*p && *p != '"' && ((*p != ' ' && *p != '\t' && *p != '=' && *p != '#' && *p != ',') || IsQuoted)) {
+
+ if ((p == NULL) || (IsQuoted == NULL))
+ return FALSE;
+
+ if (*p == L'\0')
+ return FALSE;
+
+ if ((*p != ' ' && *p != '\t' && *p != '=' && *p != '#' && *p != ',') || *IsQuoted) {
+ MoreToRead = TRUE;
+ }
+ if (*p == L'"') {
+ if (p[1] == L'"') {
+ Temp = StrDuplicate(&p[1]);
+ if (Temp != NULL) {
+ StrCpy(p, Temp);
+ FreePool(Temp);
+ }
+ MoreToRead = TRUE;
+ } else {
+ *IsQuoted = !(*IsQuoted);
+ MoreToRead = FALSE;
+ } // if/else second character is a quote
+ } // if first character is a quote
+
+ return MoreToRead;
+} // BOOLEAN KeepReading()
+
//
// get a line of tokens from a file
//
-
UINTN ReadTokenLine(IN REFIT_FILE *File, OUT CHAR16 ***TokenList)
{
BOOLEAN LineFinished, IsQuoted = FALSE;
p = Line;
LineFinished = FALSE;
while (!LineFinished) {
- // skip whitespace
+ // skip whitespace & find start of token
while ((*p == ' ' || *p == '\t' || *p == '=' || *p == ',') && !IsQuoted)
p++;
if (*p == 0 || *p == '#')
Token = p;
// find end of token
- while (*p && *p != '"' && ((*p != ' ' && *p != '\t' && *p != '=' && *p != '#' && *p != ',') || IsQuoted)) {
- if ((*p == '/') && !IsQuoted) // Switch Unix-style to DOS-style directory separators
- *p = '\\';
+ while (KeepReading(p, &IsQuoted)) {
+ if ((*p == L'/') && !IsQuoted) // Switch Unix-style to DOS-style directory separators
+ *p = L'\\';
p++;
- } // if
- if (*p == '"')
- IsQuoted = !IsQuoted;
- if (*p == 0 || *p == '#')
+ } // while
+ if (*p == L'\0' || *p == L'#')
LineFinished = TRUE;
*p++ = 0;
FreeList((VOID ***)TokenList, TokenCount);
}
-//
// handle a parameter with a single integer argument
-//
-
static VOID HandleInt(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT UINTN *Value)
{
- if (TokenCount < 2) {
- return;
- }
- if (TokenCount > 2) {
- return;
- }
- *Value = Atoi(TokenList[1]);
+ if (TokenCount == 2)
+ *Value = Atoi(TokenList[1]);
}
-//
// handle a parameter with a single string argument
-//
+static VOID HandleString(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT CHAR16 **Target) {
+ if (TokenCount == 2) {
+ MyFreePool(*Target);
+ *Target = StrDuplicate(TokenList[1]);
+ } // if
+} // static VOID HandleString()
-static VOID HandleString(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT CHAR16 **Value)
-{
- if (TokenCount < 2) {
- return;
- }
- if (TokenCount > 2) {
- return;
- }
- *Value = StrDuplicate(TokenList[1]);
-}
+// Handle a parameter with a series of string arguments, to be added to a comma-delimited
+// list. Passes each token through the CleanUpPathNameSlashes() function to ensure
+// consistency in subsequent comparisons of filenames.
+static VOID HandleStrings(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT CHAR16 **Target) {
+ UINTN i;
-//
-// read config file
-//
+ if (*Target != NULL) {
+ FreePool(*Target);
+ *Target = NULL;
+ } // if
+ for (i = 1; i < TokenCount; i++) {
+ CleanUpPathNameSlashes(TokenList[i]);
+ MergeStrings(Target, TokenList[i], L',');
+ }
+} // static VOID HandleStrings()
-VOID ReadConfig(VOID)
+// read config file
+VOID ReadConfig(CHAR16 *FileName)
{
EFI_STATUS Status;
REFIT_FILE File;
CHAR16 **TokenList;
CHAR16 *FlagName;
+ CHAR16 *SelfPath = NULL;
UINTN TokenCount, i;
- if (!FileExists(SelfDir, CONFIG_FILE_NAME)) {
- Print(L"Configuration file missing!\n");
+ // Set a few defaults only if we're loading the default file.
+ if (StriCmp(FileName, CONFIG_FILE_NAME) == 0) {
+ MyFreePool(GlobalConfig.AlsoScan);
+ GlobalConfig.AlsoScan = StrDuplicate(ALSO_SCAN_DIRS);
+// MyFreePool(GlobalConfig.DontScanVolumes);
+// GlobalConfig.DontScanVolumes = StrDuplicate(L" ");
+ MyFreePool(GlobalConfig.DontScanDirs);
+ if (SelfVolume->VolName) {
+ SelfPath = StrDuplicate(SelfVolume->VolName);
+ } else {
+ SelfPath = AllocateZeroPool(256 * sizeof(CHAR16));
+ SPrint(SelfPath, 255, L"fs%d", SelfVolume->VolNumber);
+ } // if/else
+ MergeStrings(&SelfPath, SelfDirPath, L':');
+ GlobalConfig.DontScanDirs = SelfPath;
+ MyFreePool(GlobalConfig.DontScanFiles);
+ GlobalConfig.DontScanFiles = StrDuplicate(DONT_SCAN_FILES);
+ }
+
+ if (!FileExists(SelfDir, FileName)) {
+ Print(L"Configuration file '%s' missing!\n", FileName);
return;
}
- Status = ReadFile(SelfDir, CONFIG_FILE_NAME, &File);
+ Status = ReadFile(SelfDir, FileName, &File, &i);
if (EFI_ERROR(Status))
return;
if (StriCmp(TokenList[0], L"timeout") == 0) {
HandleInt(TokenList, TokenCount, &(GlobalConfig.Timeout));
- // Note: I'm using "disable" as equivalent to "hideui" for the moment (as of rEFInd 0.2.4)
- // because I've folded two options into one and removed some values, so I want to catch
- // existing configurations as much as possible. The "disable" equivalency to "hideui" will
- // be removed sooner or later, leaving only "hideui".
- } else if ((StriCmp(TokenList[0], L"hideui") == 0) || (StriCmp(TokenList[0], L"disable") == 0)) {
+ } else if (StriCmp(TokenList[0], L"hideui") == 0) {
for (i = 1; i < TokenCount; i++) {
FlagName = TokenList[i];
if (StriCmp(FlagName, L"banner") == 0) {
} else if (StriCmp(FlagName, L"label") == 0) {
GlobalConfig.HideUIFlags |= HIDEUI_FLAG_LABEL;
} else if (StriCmp(FlagName, L"singleuser") == 0) {
- GlobalConfig.HideUIFlags |= HIDEUI_FLAG_SINGLEUSER;
+ GlobalConfig.HideUIFlags |= HIDEUI_FLAG_SINGLEUSER;
} else if (StriCmp(FlagName, L"hwtest") == 0) {
- GlobalConfig.HideUIFlags |= HIDEUI_FLAG_HWTEST;
+ GlobalConfig.HideUIFlags |= HIDEUI_FLAG_HWTEST;
} else if (StriCmp(FlagName, L"arrows") == 0) {
GlobalConfig.HideUIFlags |= HIDEUI_FLAG_ARROWS;
+ } else if (StriCmp(FlagName, L"hints") == 0) {
+ GlobalConfig.HideUIFlags |= HIDEUI_FLAG_HINTS;
+ } else if (StriCmp(FlagName, L"editor") == 0) {
+ GlobalConfig.HideUIFlags |= HIDEUI_FLAG_EDITOR;
} else if (StriCmp(FlagName, L"all") == 0) {
- GlobalConfig.HideUIFlags = HIDEUI_ALL;
+ GlobalConfig.HideUIFlags = HIDEUI_FLAG_ALL;
} else {
Print(L" unknown hideui flag: '%s'\n", FlagName);
}
}
+ } else if (StriCmp(TokenList[0], L"icons_dir") == 0) {
+ HandleString(TokenList, TokenCount, &(GlobalConfig.IconsDir));
+
} else if (StriCmp(TokenList[0], L"scanfor") == 0) {
for (i = 0; i < NUM_SCAN_OPTIONS; i++) {
if (i < TokenCount)
GlobalConfig.ScanFor[i] = ' ';
}
+ } else if ((StriCmp(TokenList[0], L"scan_delay") == 0) && (TokenCount == 2)) {
+ HandleInt(TokenList, TokenCount, &(GlobalConfig.ScanDelay));
+
} else if (StriCmp(TokenList[0], L"also_scan_dirs") == 0) {
- if (GlobalConfig.AlsoScan != NULL) {
- FreePool(GlobalConfig.AlsoScan);
- GlobalConfig.AlsoScan = NULL;
- } // if
- for (i = 1; i < TokenCount; i++)
- MergeStrings(&GlobalConfig.AlsoScan, TokenList[i], L',');
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.AlsoScan));
+
+ } else if ((StriCmp(TokenList[0], L"don't_scan_volumes") == 0) || (StriCmp(TokenList[0], L"dont_scan_volumes") == 0)) {
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.AlsoScan));
+ // Note: Don't use HandleStrings() because it modifies slashes, which might be present in volume name
+ MyFreePool(GlobalConfig.DontScanVolumes);
+ GlobalConfig.DontScanVolumes = NULL;
+ for (i = 1; i < TokenCount; i++) {
+ MergeStrings(&GlobalConfig.DontScanVolumes, TokenList[i], L',');
+ }
+
+ } else if ((StriCmp(TokenList[0], L"don't_scan_dirs") == 0) || (StriCmp(TokenList[0], L"dont_scan_dirs") == 0)) {
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.DontScanDirs));
+
+ } else if ((StriCmp(TokenList[0], L"don't_scan_files") == 0) || (StriCmp(TokenList[0], L"dont_scan_files") == 0)) {
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.DontScanFiles));
} else if (StriCmp(TokenList[0], L"scan_driver_dirs") == 0) {
- if (GlobalConfig.DriverDirs != NULL) {
- FreePool(GlobalConfig.DriverDirs);
- GlobalConfig.DriverDirs = NULL;
- } // if
- for (i = 1; i < TokenCount; i++)
- MergeStrings(&GlobalConfig.DriverDirs, TokenList[i], L',');
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.DriverDirs));
} else if (StriCmp(TokenList[0], L"showtools") == 0) {
SetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
GlobalConfig.ShowTools[i - 1] = TAG_REBOOT;
} else if (StriCmp(FlagName, L"shutdown") == 0) {
GlobalConfig.ShowTools[i - 1] = TAG_SHUTDOWN;
+ } else if (StriCmp(FlagName, L"apple_recovery") == 0) {
+ GlobalConfig.ShowTools[i - 1] = TAG_APPLE_RECOVERY;
+ } else if (StriCmp(FlagName, L"mok_tool") == 0) {
+ GlobalConfig.ShowTools[i - 1] = TAG_MOK_TOOL;
} else {
- Print(L" unknown showtools flag: '%s'\n", FlagName);
+ Print(L" unknown showtools flag: '%s'\n", FlagName);
}
} // showtools options
} else if (StriCmp(TokenList[0], L"banner") == 0) {
- HandleString(TokenList, TokenCount, &(GlobalConfig.BannerFileName));
+ HandleString(TokenList, TokenCount, &(GlobalConfig.BannerFileName));
} else if (StriCmp(TokenList[0], L"selection_small") == 0) {
- HandleString(TokenList, TokenCount, &(GlobalConfig.SelectionSmallFileName));
+ HandleString(TokenList, TokenCount, &(GlobalConfig.SelectionSmallFileName));
} else if (StriCmp(TokenList[0], L"selection_big") == 0) {
- HandleString(TokenList, TokenCount, &(GlobalConfig.SelectionBigFileName));
+ HandleString(TokenList, TokenCount, &(GlobalConfig.SelectionBigFileName));
} else if (StriCmp(TokenList[0], L"default_selection") == 0) {
- HandleString(TokenList, TokenCount, &(GlobalConfig.DefaultSelection));
+ HandleString(TokenList, TokenCount, &(GlobalConfig.DefaultSelection));
} else if (StriCmp(TokenList[0], L"textonly") == 0) {
- GlobalConfig.TextOnly = TRUE;
+ if ((TokenCount >= 2) && (StriCmp(TokenList[1], L"0") == 0)) {
+ GlobalConfig.TextOnly = FALSE;
+ } else {
+ GlobalConfig.TextOnly = TRUE;
+ }
+
+ } else if (StriCmp(TokenList[0], L"textmode") == 0) {
+ HandleInt(TokenList, TokenCount, &(GlobalConfig.RequestedTextMode));
+
+ } else if ((StriCmp(TokenList[0], L"resolution") == 0) && ((TokenCount == 2) || (TokenCount == 3))) {
+ GlobalConfig.RequestedScreenWidth = Atoi(TokenList[1]);
+ if (TokenCount == 3)
+ GlobalConfig.RequestedScreenHeight = Atoi(TokenList[2]);
+ else
+ GlobalConfig.RequestedScreenHeight = 0;
+
+ } else if (StriCmp(TokenList[0], L"use_graphics_for") == 0) {
+ GlobalConfig.GraphicsFor = 0;
+ for (i = 1; i < TokenCount; i++) {
+ if (StriCmp(TokenList[i], L"osx") == 0) {
+ GlobalConfig.GraphicsFor |= GRAPHICS_FOR_OSX;
+ } else if (StriCmp(TokenList[i], L"linux") == 0) {
+ GlobalConfig.GraphicsFor |= GRAPHICS_FOR_LINUX;
+ } else if (StriCmp(TokenList[i], L"elilo") == 0) {
+ GlobalConfig.GraphicsFor |= GRAPHICS_FOR_ELILO;
+ } else if (StriCmp(TokenList[i], L"grub") == 0) {
+ GlobalConfig.GraphicsFor |= GRAPHICS_FOR_GRUB;
+ } else if (StriCmp(TokenList[i], L"windows") == 0) {
+ GlobalConfig.GraphicsFor |= GRAPHICS_FOR_WINDOWS;
+ }
+ } // for (graphics_on tokens)
} else if (StriCmp(TokenList[0], L"scan_all_linux_kernels") == 0) {
- GlobalConfig.ScanAllLinux = TRUE;
+ if ((TokenCount >= 2) && (StriCmp(TokenList[1], L"0") == 0)) {
+ GlobalConfig.ScanAllLinux = FALSE;
+ } else {
+ GlobalConfig.ScanAllLinux = TRUE;
+ }
+
+ } else if (StriCmp(TokenList[0], L"max_tags") == 0) {
+ HandleInt(TokenList, TokenCount, &(GlobalConfig.MaxTags));
+
+ } else if ((StriCmp(TokenList[0], L"include") == 0) && (TokenCount == 2) && (StriCmp(FileName, CONFIG_FILE_NAME) == 0)) {
+ if (StriCmp(TokenList[1], FileName) != 0) {
+ ReadConfig(TokenList[1]);
+ }
- } else if ((StriCmp(TokenList[0], L"max_tags") == 0) && (TokenCount > 1)) {
- GlobalConfig.MaxTags = Atoi(TokenList[1]);
}
FreeTokenLine(&TokenList, &TokenCount);
}
- FreePool(File.Buffer);
+ MyFreePool(File.Buffer);
} /* VOID ReadConfig() */
+// Finds a volume with the specified Identifier (a volume label or a number
+// followed by a colon, for the moment). If found, sets *Volume to point to
+// that volume. If not, leaves it unchanged.
+// Returns TRUE if a match was found, FALSE if not.
+static BOOLEAN FindVolume(REFIT_VOLUME **Volume, CHAR16 *Identifier) {
+ UINTN i = 0, CountedVolumes = 0;
+ INTN Number = -1;
+ BOOLEAN Found = FALSE;
+
+ if ((StrLen(Identifier) >= 2) && (Identifier[StrLen(Identifier) - 1] == L':') &&
+ (Identifier[0] >= L'0') && (Identifier[0] <= L'9')) {
+ Number = (INTN) Atoi(Identifier);
+ }
+ while ((i < VolumesCount) && (!Found)) {
+ if (Number >= 0) { // User specified a volume by number
+ if (Volumes[i]->IsReadable) {
+ if (CountedVolumes == Number) {
+ *Volume = Volumes[i];
+ Found = TRUE;
+ }
+ CountedVolumes++;
+ } // if
+ } else { // User specified a volume by label
+ if (StriCmp(Identifier, Volumes[i]->VolName) == 0) {
+ *Volume = Volumes[i];
+ Found = TRUE;
+ } // if
+ } // if/else
+ i++;
+ } // while()
+ return (Found);
+} // static VOID FindVolume()
+
static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volume, CHAR16 *Title) {
REFIT_MENU_SCREEN *SubScreen;
LOADER_ENTRY *SubEntry;
SubEntry->me.Title = StrDuplicate(Title);
while (((TokenCount = ReadTokenLine(File, &TokenList)) > 0) && (StriCmp(TokenList[0], L"}") != 0)) {
+
if ((StriCmp(TokenList[0], L"loader") == 0) && (TokenCount > 1)) { // set the boot loader filename
- if (SubEntry->LoaderPath != NULL)
- FreePool(SubEntry->LoaderPath);
+ MyFreePool(SubEntry->LoaderPath);
SubEntry->LoaderPath = StrDuplicate(TokenList[1]);
SubEntry->DevicePath = FileDevicePath(Volume->DeviceHandle, SubEntry->LoaderPath);
+
+ } else if ((StriCmp(TokenList[0], L"volume") == 0) && (TokenCount > 1)) {
+ if (FindVolume(&Volume, TokenList[1])) {
+ MyFreePool(SubEntry->me.Title);
+ SubEntry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16));
+ SPrint(SubEntry->me.Title, 255, L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", Volume->VolName);
+ SubEntry->me.BadgeImage = Volume->VolBadgeImage;
+ SubEntry->VolName = Volume->VolName;
+ } // if match found
+
} else if (StriCmp(TokenList[0], L"initrd") == 0) {
- if (SubEntry->InitrdPath != NULL)
- FreePool(SubEntry->InitrdPath);
+ MyFreePool(SubEntry->InitrdPath);
SubEntry->InitrdPath = NULL;
if (TokenCount > 1) {
SubEntry->InitrdPath = StrDuplicate(TokenList[1]);
}
+
} else if (StriCmp(TokenList[0], L"options") == 0) {
- if (SubEntry->LoadOptions != NULL)
- FreePool(SubEntry->LoadOptions);
+ MyFreePool(SubEntry->LoadOptions);
SubEntry->LoadOptions = NULL;
if (TokenCount > 1) {
SubEntry->LoadOptions = StrDuplicate(TokenList[1]);
} // if/else
+
} else if ((StriCmp(TokenList[0], L"add_options") == 0) && (TokenCount > 1)) {
MergeStrings(&SubEntry->LoadOptions, TokenList[1], L' ');
+
} else if ((StriCmp(TokenList[0], L"graphics") == 0) && (TokenCount > 1)) {
SubEntry->UseGraphicsMode = (StriCmp(TokenList[1], L"on") == 0);
+
} else if (StriCmp(TokenList[0], L"disabled") == 0) {
SubEntry->Enabled = FALSE;
} // ief/elseif
+
FreeTokenLine(&TokenList, &TokenCount);
} // while()
+
if (SubEntry->InitrdPath != NULL) {
MergeStrings(&SubEntry->LoadOptions, L"initrd=", L' ');
MergeStrings(&SubEntry->LoadOptions, SubEntry->InitrdPath, 0);
- FreePool(SubEntry->InitrdPath);
+ MyFreePool(SubEntry->InitrdPath);
SubEntry->InitrdPath = NULL;
} // if
if (SubEntry->Enabled == TRUE) {
Entry->me.SubScreen = SubScreen;
} // VOID AddSubmenu()
-// Finds a volume with the specified Identifier (a volume label or a number
-// followed by a colon, for the moment). If found, sets *Volume to point to
-// that volume. If not, leaves it unchanged.
-// Returns TRUE if a match was found, FALSE if not.
-static BOOLEAN FindVolume(REFIT_VOLUME **Volume, CHAR16 *Identifier) {
- UINTN i = 0, CountedVolumes = 0;
- INTN Number = -1;
- BOOLEAN Found = FALSE;
-
- if ((StrLen(Identifier) >= 2) && (Identifier[StrLen(Identifier) - 1] == L':') &&
- (Identifier[0] >= L'0') && (Identifier[0] <= L'9')) {
- Number = (INTN) Atoi(Identifier);
- }
- while ((i < VolumesCount) && (!Found)) {
- if (Number >= 0) { // User specified a volume by number
- if (Volumes[i]->IsReadable) {
- if (CountedVolumes == Number) {
- *Volume = Volumes[i];
- Found = TRUE;
- }
- CountedVolumes++;
- } // if
- } else { // User specified a volume by label
- if (StriCmp(Identifier, Volumes[i]->VolName) == 0) {
- *Volume = Volumes[i];
- Found = TRUE;
- } // if
- } // if/else
- i++;
- } // while()
- return (Found);
-} // static VOID FindVolume()
-
// Adds the options from a SINGLE refind.conf stanza to a new loader entry and returns
// that entry. The calling function is then responsible for adding the entry to the
// list of entries.
return NULL;
Entry->Title = StrDuplicate(Title);
- Entry->me.Title = PoolPrint(L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", CurrentVolume->VolName);
+ Entry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16));
+ SPrint(Entry->me.Title, 255, L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", CurrentVolume->VolName);
Entry->me.Row = 0;
Entry->me.BadgeImage = CurrentVolume->VolBadgeImage;
Entry->VolName = CurrentVolume->VolName;
Entry->LoaderPath = StrDuplicate(TokenList[1]);
Entry->DevicePath = FileDevicePath(CurrentVolume->DeviceHandle, Entry->LoaderPath);
SetLoaderDefaults(Entry, TokenList[1], CurrentVolume);
- FreePool(Entry->LoadOptions);
+ MyFreePool(Entry->LoadOptions);
Entry->LoadOptions = NULL; // Discard default options, if any
DefaultsSet = TRUE;
+
} else if ((StriCmp(TokenList[0], L"volume") == 0) && (TokenCount > 1)) {
if (FindVolume(&CurrentVolume, TokenList[1])) {
- FreePool(Entry->me.Title);
- Entry->me.Title = PoolPrint(L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", CurrentVolume->VolName);
+ MyFreePool(Entry->me.Title);
+ Entry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16));
+ SPrint(Entry->me.Title, 255, L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", CurrentVolume->VolName);
Entry->me.BadgeImage = CurrentVolume->VolBadgeImage;
Entry->VolName = CurrentVolume->VolName;
} // if match found
+
} else if ((StriCmp(TokenList[0], L"icon") == 0) && (TokenCount > 1)) {
- FreePool(Entry->me.Image);
+ MyFreePool(Entry->me.Image);
Entry->me.Image = LoadIcns(CurrentVolume->RootDir, TokenList[1], 128);
if (Entry->me.Image == NULL) {
Entry->me.Image = DummyImage(128);
}
+
} else if ((StriCmp(TokenList[0], L"initrd") == 0) && (TokenCount > 1)) {
- if (Entry->InitrdPath)
- FreePool(Entry->InitrdPath);
+ MyFreePool(Entry->InitrdPath);
Entry->InitrdPath = StrDuplicate(TokenList[1]);
+
} else if ((StriCmp(TokenList[0], L"options") == 0) && (TokenCount > 1)) {
- if (Entry->LoadOptions)
- FreePool(Entry->LoadOptions);
+ MyFreePool(Entry->LoadOptions);
Entry->LoadOptions = StrDuplicate(TokenList[1]);
+
} else if ((StriCmp(TokenList[0], L"ostype") == 0) && (TokenCount > 1)) {
if (TokenCount > 1) {
Entry->OSType = TokenList[1][0];
}
+
} else if ((StriCmp(TokenList[0], L"graphics") == 0) && (TokenCount > 1)) {
Entry->UseGraphicsMode = (StriCmp(TokenList[1], L"on") == 0);
+
} else if (StriCmp(TokenList[0], L"disabled") == 0) {
Entry->Enabled = FALSE;
+
} else if ((StriCmp(TokenList[0], L"submenuentry") == 0) && (TokenCount > 1)) {
AddSubmenu(Entry, File, CurrentVolume, TokenList[1]);
AddedSubmenu = TRUE;
+
} // set options to pass to the loader program
FreeTokenLine(&TokenList, &TokenCount);
} // while()
if (Entry->InitrdPath) {
MergeStrings(&Entry->LoadOptions, L"initrd=", L' ');
MergeStrings(&Entry->LoadOptions, Entry->InitrdPath, 0);
- FreePool(Entry->InitrdPath);
+ MyFreePool(Entry->InitrdPath);
Entry->InitrdPath = NULL;
} // if
return(Entry);
} // static VOID AddStanzaEntries()
-// Read the user-configured loaders file, refind_loaders.conf, and add or delete
+// Read the user-configured menu entries from refind.conf and add or delete
// entries based on the contents of that file....
VOID ScanUserConfigured(VOID)
{
REFIT_VOLUME *Volume;
CHAR16 **TokenList;
CHAR16 *Title = NULL;
- UINTN TokenCount;
+ UINTN TokenCount, size;
LOADER_ENTRY *Entry;
if (FileExists(SelfDir, CONFIG_FILE_NAME)) {
- Status = ReadFile(SelfDir, CONFIG_FILE_NAME, &File);
+ Status = ReadFile(SelfDir, CONFIG_FILE_NAME, &File, &size);
if (EFI_ERROR(Status))
return;
GenerateSubScreen(Entry, Volume);
AddPreparedLoaderEntry(Entry);
} else {
- FreePool(Entry);
+ MyFreePool(Entry);
} // if/else
- FreePool(Title);
+ MyFreePool(Title);
} // if
FreeTokenLine(&TokenList, &TokenCount);
} // while()
REFIT_FILE * ReadLinuxOptionsFile(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) {
CHAR16 *OptionsFilename, *FullFilename;
BOOLEAN GoOn = TRUE;
- UINTN i = 0;
+ UINTN i = 0, size;
REFIT_FILE *File = NULL;
EFI_STATUS Status;
MergeStrings(&FullFilename, OptionsFilename, '\\');
if (FileExists(Volume->RootDir, FullFilename)) {
File = AllocateZeroPool(sizeof(REFIT_FILE));
- Status = ReadFile(Volume->RootDir, FullFilename, File);
+ Status = ReadFile(Volume->RootDir, FullFilename, File, &size);
GoOn = FALSE;
if (CheckError(Status, L"while loading the Linux options file")) {
if (File != NULL)
} else { // a filename string is NULL
GoOn = FALSE;
} // if/else
- if (OptionsFilename != NULL)
- FreePool(OptionsFilename);
- if (FullFilename != NULL)
- FreePool(FullFilename);
+ MyFreePool(OptionsFilename);
+ MyFreePool(FullFilename);
OptionsFilename = FullFilename = NULL;
} while (GoOn);
return (File);
Options = StrDuplicate(TokenList[1]);
FreeTokenLine(&TokenList, &TokenCount);
FreePool(File);
- }
+ } // if
return Options;
} // static CHAR16 * GetOptionsFile()