Fixed uninitialized-pointer bug that manifested as a crash with

[refind] / refind / config.h

diff --git a/refind/config.h b/refind/config.h
index bc211a98ac74605803cf9de9ce07135457e9dd82..b69b0a3a0544b917ee6f713b14f15524b6147a9f 100644 (file)
--- a/refind/config.h
+++ b/refind/config.h
@@ -35,7 +35,7 @@
  */
 
 /*
- * Modifications copyright (c) 2012 Roderick W. Smith
+ * Modifications copyright (c) 2012-2015 Roderick W. Smith
  * 
  * Modifications distributed under the terms of the GNU General Public
  * License (GPL) version 3 (GPLv3), a copy of which must be distributed
@@ -53,6 +53,7 @@
 #endif
 #include "global.h"
 
+
 //
 // config module
 //
@@ -67,23 +68,15 @@ typedef struct {
     CHAR16  *End16Ptr;
 } REFIT_FILE;
 
-#define HIDEUI_FLAG_NONE       (0x0000)
-#define HIDEUI_FLAG_BANNER     (0x0001)
-#define HIDEUI_FLAG_LABEL      (0x0002)
-#define HIDEUI_FLAG_SINGLEUSER (0x0004)
-#define HIDEUI_FLAG_HWTEST     (0x0008)
-#define HIDEUI_FLAG_ARROWS     (0x0010)
-#define HIDEUI_FLAG_HINTS      (0x0020)
-#define HIDEUI_FLAG_EDITOR     (0x0040)
-#define HIDEUI_FLAG_ALL       ((0xffff))
-
 #define CONFIG_FILE_NAME         L"refind.conf"
-#define DONT_SCAN_FILES L"shim.efi,MokManager.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi"
-#define ALSO_SCAN_DIRS L"boot"
+// Note: Below is combined with MOK_NAMES to make default
+#define DONT_SCAN_FILES L"shim.efi,shim-fedora.efi,shimx64.efi,PreLoader.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi,bootmgr.efi"
+#define DONT_SCAN_VOLUMES L"LRS_ESP"
+#define ALSO_SCAN_DIRS L"boot,@/boot"
 
 EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_FILE *File, UINTN *size);
 VOID ReadConfig(CHAR16 *FileName);
-VOID ScanUserConfigured(VOID);
+VOID ScanUserConfigured(CHAR16 *FileName);
 UINTN ReadTokenLine(IN REFIT_FILE *File, OUT CHAR16 ***TokenList);
 VOID FreeTokenLine(IN OUT CHAR16 ***TokenList, IN OUT UINTN *TokenCount);
 REFIT_FILE * ReadLinuxOptionsFile(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume);