diff options
| author | 2022-12-16 14:03:59 -0500 | |
|---|---|---|
| committer | 2022-12-17 06:03:59 +1100 | |
| commit | 13910382a5e846677f30d1645bfb44e4983de557 (patch) | |
| tree | bc75e208d5dc4305a6721dff63efaec2864db178 /plugins/data | |
| parent | 14c3d33e86ceeeeb57c44cb7d6aa85685f79813a (diff) | |
osd/modules/file: Don't magically substitute environment variables when opening files. (#9859)
* util/options.cpp: Added option types for single and multiple paths.
* util/options.cpp: Substitute environment variables in values from defaults and INI files.
* ui/dirmenu.cpp: Removed hard-coded list of multi-path options.
* plugins: Don't substitute environment variables in path options.
Diffstat (limited to 'plugins/data')
| -rw-r--r-- | plugins/data/data_hiscore.lua | 6 | ||||
| -rw-r--r-- | plugins/data/database.lua | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/data/data_hiscore.lua b/plugins/data/data_hiscore.lua index c0794b20195..f05e4ddd173 100644 --- a/plugins/data/data_hiscore.lua +++ b/plugins/data/data_hiscore.lua @@ -5,7 +5,7 @@ local dat = {} local env = {} local output local curset -local path = emu.subst_env(mame_manager.ui.options.entries.historypath:value():gsub("([^;]+)", "%1/hi2txt")) +local path = mame_manager.ui.options.entries.historypath:value():gsub("([^;]+)", "%1/hi2txt") local htmlentites = { ["amp"] = "&", ["quot"] = utf8.char(34), @@ -355,7 +355,7 @@ local htmlentites = { function env.open(file, size, swap) if file == ".hi" then local path = "hi" - local ini = emu.file(emu.subst_env(manager.options.entries.inipath:value()), 1) + local ini = emu.file(manager.options.entries.inipath:value(), 1) local ret = ini:open("hiscore.ini") if not ret then local inifile = ini:read(ini:size()) @@ -369,7 +369,7 @@ function env.open(file, size, swap) end file = path .. "/" .. curset .. ".hi" else - file = emu.subst_env(manager.options.entries.nvram_directory:value()) .. "/" .. curset .. "/" .. file + file = manager.options.entries.nvram_directory:value() .. "/" .. curset .. "/" .. file end local f = io.open(file, "rb") local content = f:read("*all") diff --git a/plugins/data/database.lua b/plugins/data/database.lua index e0249182409..4fb4eaa2ddf 100644 --- a/plugins/data/database.lua +++ b/plugins/data/database.lua @@ -10,7 +10,7 @@ local function check_db_result(msg) end local function settings_path() - return emu.subst_env(manager.machine.options.entries.homepath:value():match('([^;]+)')) .. '/data' + return manager.machine.options.entries.homepath:value():match('([^;]+)') .. '/data' end local function check_version_table() @@ -147,7 +147,7 @@ end function dbtable.open_data_file(file) local fh, filepath for path in mame_manager.ui.options.entries.historypath:value():gmatch('([^;]+)') do - filepath = emu.subst_env(path) .. '/' .. file + filepath = path .. '/' .. file fh = io.open(filepath, 'r') if fh then break |
