fly/fgdata
1
0
Fork 0
Code Activity

- load_nasal(): catch usage of improper namespaces (e.g. $FG_HOME/Nasal/isa.nas)

Browse source 
- IOrules: add harmless rule for extremely popular Nasal addon script  :-)
This commit is contained in:
mfranz 2008-07-30 20:34:52 +00:00
parent 443c261cdd
commit 49defb639e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Nasal/IOrules
View file

@ -30,4 +30,5 @@ READ ALLOW $FG_HOME/*
WRITE ALLOW $FG_HOME/*.sav
WRITE ALLOW $FG_HOME/Export/*
WRITE ALLOW $FG_HOME/state/*.xml
WRITE ALLOW $FG_HOME/aircraft-data/*.xml

8
Nasal/io.nas
View file

@ -45,11 +45,14 @@ var load_nasal = func(file, module = nil) {
if (module == nil)
module = split(".", split("/", file)[-1])[0];
printlog("info", "loading ", file, " into namespace ", module);
if (!contains(globals, module))
globals[module] = {};
elsif (typeof(globals[module]) != "hash")
die("io.load_nasal(): namespace '" ~ module ~ "' already in use, but not a hash");
var err = [];
printlog("info", "loading ", file, " into namespace ", module);
var code = call(func compile(readfile(file), file), nil, err);
if (size(err)) {
(func nil)(); # needed to get correct caller results (?!?)
@ -316,7 +319,8 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
var thislistener = caller(0)[1];
var _closure = globals.closure;
globals.closure = func(fn, level = 0) {
if (fn != thislistener and fn != io_open and fn != caller(0)[1]
var thisfunction = caller(0)[1];
if (fn != thislistener and fn != io_open and fn != thisfunction
and fn != read_validator and fn != write_validator)
return _closure(fn, level);