File->End8Ptr = File->Current8Ptr + File->BufferSize;
File->Current16Ptr = (CHAR16 *)File->Buffer;
File->End16Ptr = File->Current16Ptr + (File->BufferSize >> 1);
-
+
// detect encoding
File->Encoding = ENCODING_ISO8859_1; // default: 1:1 translation of CHAR8 to CHAR16
if (File->BufferSize >= 4) {
}
// TODO: detect other encodings as they are implemented
}
-
+
return EFI_SUCCESS;
}
if (*p == 0 || *p == '#')
LineFinished = TRUE;
*p++ = 0;
-
+
AddListElement((VOID ***)TokenList, &TokenCount, (VOID *)StrDuplicate(Token));
}
-
+
FreePool(Line);
}
return (TokenCount);
TokenCount = ReadTokenLine(&File, &TokenList);
if (TokenCount == 0)
break;
-
+
if (StriCmp(TokenList[0], L"timeout") == 0) {
HandleInt(TokenList, TokenCount, &(GlobalConfig.Timeout));
else
GlobalConfig.ScanFor[i] = ' ';
}
- } else if (StriCmp(TokenList[0], L"showtools") == 0) {
+
+ } 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',');
+
+ } else if (StriCmp(TokenList[0], L"showtools") == 0) {
SetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
for (i = 1; (i < TokenCount) && (i < NUM_TOOLS); i++) {
FlagName = TokenList[i];
} else if (StriCmp(TokenList[0], L"default_selection") == 0) {
HandleString(TokenList, TokenCount, &(GlobalConfig.DefaultSelection));
-
+
} else if (StriCmp(TokenList[0], L"textonly") == 0) {
GlobalConfig.TextOnly = TRUE;
if ((SubEntry == NULL) || (SubScreen == NULL))
return;
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)
Entry->me.SubScreen = SubScreen;
} // VOID AddSubmenu()
-// Adds the options from a SINGLE loaders.conf stanza to a new loader entry and returns
+// 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.
static LOADER_ENTRY * AddStanzaEntries(REFIT_FILE *File, REFIT_VOLUME *Volume, CHAR16 *Title) {
UINTN TokenCount;
LOADER_ENTRY *Entry;
BOOLEAN DefaultsSet = FALSE, AddedSubmenu = FALSE;
+ REFIT_VOLUME *CurrentVolume = Volume;
// prepare the menu entry
Entry = InitializeLoaderEntry(NULL);
return NULL;
Entry->Title = StrDuplicate(Title);
- Entry->me.Title = PoolPrint(L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", Volume->VolName);
+ Entry->me.Title = PoolPrint(L"Boot %s from %s", (Title != NULL) ? Title : L"Unknown", CurrentVolume->VolName);
Entry->me.Row = 0;
- Entry->me.BadgeImage = Volume->VolBadgeImage;
- Entry->VolName = Volume->VolName;
+ Entry->me.BadgeImage = CurrentVolume->VolBadgeImage;
+ Entry->VolName = CurrentVolume->VolName;
// Parse the config file to add options for a single stanza, terminating when the token
// is "}" or when the end of file is reached.
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
Entry->LoaderPath = StrDuplicate(TokenList[1]);
- Entry->DevicePath = FileDevicePath(Volume->DeviceHandle, Entry->LoaderPath);
- SetLoaderDefaults(Entry, TokenList[1], Volume);
+ Entry->DevicePath = FileDevicePath(CurrentVolume->DeviceHandle, Entry->LoaderPath);
+ SetLoaderDefaults(Entry, TokenList[1], CurrentVolume);
FreePool(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);
+ 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);
- Entry->me.Image = LoadIcns(Volume->RootDir, TokenList[1], 128);
+ 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"disabled") == 0) {
Entry->Enabled = FALSE;
} else if ((StriCmp(TokenList[0], L"submenuentry") == 0) && (TokenCount > 1)) {
- AddSubmenu(Entry, File, Volume, TokenList[1]);
+ AddSubmenu(Entry, File, CurrentVolume, TokenList[1]);
AddedSubmenu = TRUE;
} // set options to pass to the loader program
FreeTokenLine(&TokenList, &TokenCount);
} // if
if (!DefaultsSet)
- SetLoaderDefaults(Entry, L"\\EFI\\BOOT\\nemo.efi", Volume); // user included no entry; use bogus one
+ SetLoaderDefaults(Entry, L"\\EFI\\BOOT\\nemo.efi", CurrentVolume); // user included no entry; use bogus one
return(Entry);
} // static VOID AddStanzaEntries()
-// Read the user-configured loaders file, loaders.conf, and add or delete
+// Read the user-configured loaders file, refind_loaders.conf, and add or delete
// entries based on the contents of that file....
VOID ScanUserConfigured(VOID)
{