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

add __filename and __dirname to global context also when using internal.load()

This commit is contained in:
Jan Steemann 2015-03-25 18:06:42 +01:00
parent 7ec3a18e04
commit 4566aa085a
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/V8/v8-utils.cpp
View File

@ -1648,6 +1648,16 @@ static void JS_Load (const v8::FunctionCallbackInfo<v8::Value>& args) {
} }
v8::Handle<v8::Value> filename = args[0]; v8::Handle<v8::Value> filename = args[0];
// save state of __dirname and __filename
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);
v8::Handle<v8::Value> result = v8::Handle<v8::Value> result =
TRI_ExecuteJavaScriptString(isolate, TRI_ExecuteJavaScriptString(isolate,
@ -1655,6 +1665,20 @@ static void JS_Load (const v8::FunctionCallbackInfo<v8::Value>& args) {
TRI_V8_PAIR_STRING(content, length), TRI_V8_PAIR_STRING(content, length),
filename->ToString(), filename->ToString(),
false); false);
// restore old values for __dirname and __filename
if (oldFilename.IsEmpty() || oldFilename->IsUndefined()) {
current->ForceDelete(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);
}
TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, content); TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, content);
TRI_V8_RETURN(result); TRI_V8_RETURN(result);