xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #122 from tadmarshall/SERVER-3771-part-1-reissue-2

Browse Source 
SERVER-3771 -- part 1 (reissue 2) -- don't let 'prompt' become undefined
This commit is contained in:
Eliot
2011-10-31 21:10:11 -07:00
parent 749b1b2d8d 862dc0f711
commit 751896bafd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
shell/dbshell.cpp
View File

@@ -823,15 +823,22 @@ int _main(int argc, char* argv[]) {
// shellMainScope->localConnect;
//DBClientWithCommands *c = getConnection( JSContext *cx, JSObject *obj );
bool haveStringPrompt = false;
promptType = scope->type("prompt");
if (promptType == String){
if( promptType == String ) {
prompt = scope->getString("prompt");
} else if (promptType == Code) {
scope->exec("__prompt__ = prompt();", "", false, false, false, 0);
prompt = scope->getString("__prompt__");
} else {
prompt = sayReplSetMemberState()+"> ";
haveStringPrompt = true;
}
else if( promptType == Code ) {
scope->exec("delete __prompt__;", "", false, false, false, 0);
scope->exec("__prompt__ = prompt();", "", false, false, false, 0);
if( scope->type("__prompt__") == String ) {
prompt = scope->getString("__prompt__");
haveStringPrompt = true;
}
}
if( !haveStringPrompt )
prompt = sayReplSetMemberState()+"> ";
char * line = shellReadline( prompt.c_str() );