X-Git-Url: https://code.delx.au/refind/blobdiff_plain/afd7092d8a0f062ba23337228502ac5aa85b4ed6..2a9f0905f01f51c3f831af471ddfb2cab416e386:/refind/config.c diff --git a/refind/config.c b/refind/config.c index 7e99dcf..a2c36fe 100644 --- a/refind/config.c +++ b/refind/config.c @@ -49,12 +49,12 @@ #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) @@ -97,7 +97,7 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F File->Buffer = AllocatePool(File->BufferSize); Status = refit_call3_wrapper(FileHandle->Read, FileHandle, &File->BufferSize, File->Buffer); if (CheckError(Status, L"while loading the configuration file")) { - FreePool(File->Buffer); + MyFreePool(File->Buffer); File->Buffer = NULL; refit_call1_wrapper(FileHandle->Close, FileHandle); return Status; @@ -277,14 +277,14 @@ 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() // Handle a parameter with a series of string arguments, to be added to a comma-delimited -// list +// 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; @@ -292,8 +292,10 @@ static VOID HandleStrings(IN CHAR16 **TokenList, IN UINTN TokenCount, OUT CHAR16 FreePool(*Target); *Target = NULL; } // if - for (i = 1; i < TokenCount; i++) - MergeStrings(Target, TokenList[i], L','); + for (i = 1; i < TokenCount; i++) { + CleanUpPathNameSlashes(TokenList[i]); + MergeStrings(Target, TokenList[i], L','); + } } // static VOID HandleStrings() // read config file @@ -353,9 +355,15 @@ 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)); + } else if ((StriCmp(TokenList[0], L"don't_scan_dirs") == 0) || (StriCmp(TokenList[0], L"dont_scan_dirs") == 0)) { + HandleStrings(TokenList, TokenCount, &(GlobalConfig.DontScan)); + } else if (StriCmp(TokenList[0], L"scan_driver_dirs") == 0) { HandleStrings(TokenList, TokenCount, &(GlobalConfig.DriverDirs)); @@ -399,16 +407,33 @@ VOID ReadConfig(VOID) GlobalConfig.RequestedScreenWidth = Atoi(TokenList[1]); GlobalConfig.RequestedScreenHeight = Atoi(TokenList[2]); + } 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; } 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() */ static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volume, CHAR16 *Title) { @@ -427,38 +452,43 @@ static VOID AddSubmenu(LOADER_ENTRY *Entry, REFIT_FILE *File, REFIT_VOLUME *Volu 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"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) { @@ -516,7 +546,8 @@ static LOADER_ENTRY * AddStanzaEntries(REFIT_FILE *File, REFIT_VOLUME *Volume, C 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; @@ -528,29 +559,28 @@ 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); - 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) { @@ -573,7 +603,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 @@ -611,9 +641,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() @@ -659,10 +689,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); @@ -682,7 +710,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()