Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

When running --javascript.execute also set __filename and __dirname as JS_Load does - so the environment for scripts is similar.

This commit is contained in:
Willi Goesgens 2015-06-01 12:01:21 +02:00
parent b2f6f29c55
commit 6af4c548ae
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arangosh/V8Client/arangosh.cpp
View File

@ -1796,8 +1796,31 @@ static bool RunScripts (v8::Isolate* isolate,
if (execute) { if (execute) {
v8::Handle<v8::String> name = TRI_V8_STD_STRING(scripts[i]); v8::Handle<v8::String> name = TRI_V8_STD_STRING(scripts[i]);
v8::Handle<v8::Value> args[] = { name }; v8::Handle<v8::Value> args[] = { name };
v8::Handle<v8::Value> filename = args[0];
v8::Handle<v8::Object> current = isolate->GetCurrentContext()->Global();
auto oldFilename = current->Get(TRI_V8_ASCII_STRING("__filename"));
current->ForceSet(TRI_V8_ASCII_STRING("__filename"), filename);
auto oldDirname = current->Get(TRI_V8_ASCII_STRING("__dirname"));
auto dirname = TRI_Dirname(TRI_ObjectToString(filename).c_str());
current->ForceSet(TRI_V8_ASCII_STRING("__dirname"), TRI_V8_STRING(dirname));
TRI_FreeString(TRI_CORE_MEM_ZONE, dirname);
ExecuteFileCallback->Call(ExecuteFileCallback, 1, args); ExecuteFileCallback->Call(ExecuteFileCallback, 1, args);
// restore old values for __dirname and __filename
if (oldFilename.IsEmpty() || oldFilename->IsUndefined()) {
current->Delete(TRI_V8_ASCII_STRING("__filename"));
}
else {
current->ForceSet(TRI_V8_ASCII_STRING("__filename"), oldFilename);
}
if (oldDirname.IsEmpty() || oldDirname->IsUndefined()) {
current->ForceDelete(TRI_V8_ASCII_STRING("__dirname"));
}
else {
current->ForceSet(TRI_V8_ASCII_STRING("__dirname"), oldDirname);
}
} }
else { else {
TRI_ParseJavaScriptFile(isolate, scripts[i].c_str()); TRI_ParseJavaScriptFile(isolate, scripts[i].c_str());