X-Git-Url: https://code.delx.au/refind/blobdiff_plain/4c9f41e161bd197922912efbcf4cc676077d5c00..e0f6b77e5692ec112bb803202ae27f8c5d55de50:/refind/config.c diff --git a/refind/config.c b/refind/config.c index eb5040c..3919127 100644 --- a/refind/config.c +++ b/refind/config.c @@ -67,19 +67,21 @@ static REFIT_MENU_ENTRY MenuEntryReturn = { L"Return to Main Menu", TAG_RETURN // 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); @@ -89,15 +91,19 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F 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; @@ -126,7 +132,7 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F } // TODO: detect other encodings as they are implemented } - + return EFI_SUCCESS; } @@ -277,8 +283,7 @@ static VOID HandleInt(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT UINTN *Val // handle a parameter with a single string argument static VOID HandleString(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT CHAR16 **Target) { if (TokenCount == 2) { - if (*Target != NULL) - FreePool(*Target); + MyFreePool(*Target); *Target = StrDuplicate(TokenList[1]); } // if } // static VOID HandleString() @@ -313,10 +318,12 @@ VOID ReadConfig(VOID) return; } - Status = ReadFile(SelfDir, CONFIG_FILE_NAME, &File); + Status = ReadFile(SelfDir, CONFIG_FILE_NAME, &File, &i); if (EFI_ERROR(Status)) return; + GlobalConfig.DontScan = StrDuplicate(SelfDirPath); + for (;;) { TokenCount = ReadTokenLine(&File, &TokenList); if (TokenCount == 0) @@ -356,6 +363,9 @@ VOID ReadConfig(VOID) 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) { HandleStrings(TokenList, TokenCount, &(GlobalConfig.AlsoScan)); @@ -381,6 +391,10 @@ VOID ReadConfig(VOID) 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); } @@ -408,15 +422,15 @@ VOID ReadConfig(VOID) } 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")) { + if (StriCmp(TokenList[i], L"osx") == 0) { GlobalConfig.GraphicsFor |= GRAPHICS_FOR_OSX; - } else if (StriCmp(TokenList[i], L"linux")) { + } else if (StriCmp(TokenList[i], L"linux") == 0) { GlobalConfig.GraphicsFor |= GRAPHICS_FOR_LINUX; - } else if (StriCmp(TokenList[i], L"elilo")) { + } else if (StriCmp(TokenList[i], L"elilo") == 0) { GlobalConfig.GraphicsFor |= GRAPHICS_FOR_ELILO; - } else if (StriCmp(TokenList[i], L"grub")) { + } else if (StriCmp(TokenList[i], L"grub") == 0) { GlobalConfig.GraphicsFor |= GRAPHICS_FOR_GRUB; - } else if (StriCmp(TokenList[i], L"windows")) { + } else if (StriCmp(TokenList[i], L"windows") == 0) { GlobalConfig.GraphicsFor |= GRAPHICS_FOR_WINDOWS; } } // for (graphics_on tokens) @@ -426,13 +440,47 @@ VOID ReadConfig(VOID) } else if (StriCmp(TokenList[0], L"max_tags") == 0) { HandleInt(TokenList, TokenCount, &(GlobalConfig.MaxTags)); + } 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; @@ -451,22 +499,28 @@ static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volu 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]); @@ -488,7 +542,7 @@ static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volu 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) { @@ -497,39 +551,6 @@ static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volu 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. @@ -559,42 +580,49 @@ static LOADER_ENTRY * AddStanzaEntries(REFIT_FILE *File, REFIT_VOLUME *Volume, C 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); + 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() @@ -605,7 +633,7 @@ static LOADER_ENTRY * AddStanzaEntries(REFIT_FILE *File, REFIT_VOLUME *Volume, C 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 @@ -624,11 +652,11 @@ 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; @@ -643,9 +671,9 @@ VOID ScanUserConfigured(VOID) GenerateSubScreen(Entry, Volume); AddPreparedLoaderEntry(Entry); } else { - FreePool(Entry); + MyFreePool(Entry); } // if/else - FreePool(Title); + MyFreePool(Title); } // if FreeTokenLine(&TokenList, &TokenCount); } // while() @@ -668,7 +696,7 @@ VOID ScanUserConfigured(VOID) 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; @@ -679,7 +707,7 @@ REFIT_FILE * ReadLinuxOptionsFile(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume 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) @@ -691,10 +719,8 @@ REFIT_FILE * ReadLinuxOptionsFile(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume } 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); @@ -714,7 +740,7 @@ CHAR16 * GetFirstOptionsFromFile(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) Options = StrDuplicate(TokenList[1]); FreeTokenLine(&TokenList, &TokenCount); FreePool(File); - } + } // if return Options; } // static CHAR16 * GetOptionsFile()