fly/fgdata
1
0
Fork 0
Code Activity

io.open(): turn relative paths into absolute ones before checking

Browse source
This commit is contained in:
mfranz 2008-06-22 11:31:41 +00:00
parent d86b1b9c74
commit 5240b57018
1 changed files with 5 additions and 1 deletions

6
Nasal/io.nas
View file

@ -148,6 +148,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
var _open = open;
var root = string.fixpath(getprop("/sim/fg-root"));
var home = string.fixpath(getprop("/sim/fg-home"));
var curr = string.fixpath(getprop("/sim/fg-current"));
var config = "Nasal/IOrules";
var read_rules = [];
@ -185,7 +186,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
# catch exceptions so that a die() doesn't ruin everything
call(func load_rules(home ~ "/" ~ config) or load_rules(root ~ "/" ~ config), nil, var err = []);
if(size(err)) {
if(curr == "" or size(err)) {
debug.printerror(err);
read_rules = write_rules = [];
}
@ -202,6 +203,9 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
if(mode == "r" or mode == "rb" or mode == "br")
rules = read_rules;
if(path[0] != '/')
path = curr ~ '/' ~ path;
var fpath = string.fixpath(path);
foreach(var d; rules) {
if(string.match(fpath, d[0])) {