diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
| commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
| tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp | |
| parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
| parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
| download | Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp index 190deff..92b1e58 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp @@ -443,14 +443,12 @@ static bool runWithScripts(GlobalObject* globalObject, const Vector<Script>& scr return success; } -static -#if !HAVE(READLINE) -NO_RETURN -#endif -void runInteractive(GlobalObject* globalObject) +#define RUNNING_FROM_XCODE 0 + +static void runInteractive(GlobalObject* globalObject) { while (true) { -#if HAVE(READLINE) +#if HAVE(READLINE) && !RUNNING_FROM_XCODE char* line = readline(interactivePrompt); if (!line) break; @@ -459,7 +457,7 @@ void runInteractive(GlobalObject* globalObject) Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(line, interpreterName)); free(line); #else - puts(interactivePrompt); + printf("%s", interactivePrompt); Vector<char, 256> line; int c; while ((c = getchar()) != EOF) { @@ -468,6 +466,8 @@ void runInteractive(GlobalObject* globalObject) break; line.append(c); } + if (line.isEmpty()) + break; line.append('\0'); Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(line.data(), interpreterName)); #endif |