diff options
| author | Steve Bennett <steveb@workware.net.au> | 2016-02-28 12:03:53 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2016-03-27 11:01:48 +1000 |
| commit | 1df642942d9366d5f523567ddffae26018f57856 (patch) | |
| tree | f027e0fb7f3ce35a2bbaa261da014718a19fdf2a /jim-interactive.c | |
| parent | d56bd19304e9361f125aaec93d8f6cf8b8191592 (diff) | |
| download | jimtcl-1df642942d9366d5f523567ddffae26018f57856.zip jimtcl-1df642942d9366d5f523567ddffae26018f57856.tar.gz jimtcl-1df642942d9366d5f523567ddffae26018f57856.tar.bz2 | |
Small code cleanups
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-interactive.c')
| -rw-r--r-- | jim-interactive.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/jim-interactive.c b/jim-interactive.c index f07eea1..a3cf6a0 100644 --- a/jim-interactive.c +++ b/jim-interactive.c @@ -98,20 +98,19 @@ int Jim_InteractivePrompt(Jim_Interp *interp) char prompt[20]; const char *str; - if (retcode != 0) { + if (retcode != JIM_OK) { const char *retcodestr = Jim_ReturnCode(retcode); if (*retcodestr == '?') { - snprintf(prompt, sizeof(prompt) - 3, "[%d] ", retcode); + snprintf(prompt, sizeof(prompt) - 3, "[%d] . ", retcode); } else { - snprintf(prompt, sizeof(prompt) - 3, "[%s] ", retcodestr); + snprintf(prompt, sizeof(prompt) - 3, "[%s] . ", retcodestr); } } else { - prompt[0] = '\0'; + strcpy(prompt, ". "); } - strcat(prompt, ". "); scriptObjPtr = Jim_NewStringObj(interp, "", 0); Jim_IncrRefCount(scriptObjPtr); @@ -130,14 +129,12 @@ int Jim_InteractivePrompt(Jim_Interp *interp) goto out; } if (Jim_Length(scriptObjPtr) != 0) { + /* Line continuation */ Jim_AppendString(interp, scriptObjPtr, "\n", 1); } Jim_AppendString(interp, scriptObjPtr, line, -1); free(line); str = Jim_GetString(scriptObjPtr, &len); - if (len == 0) { - continue; - } if (Jim_ScriptIsComplete(str, len, &state)) break; @@ -160,7 +157,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp) Jim_DecrRefCount(interp, scriptObjPtr); if (retcode == JIM_EXIT) { - retcode = JIM_EXIT; break; } if (retcode == JIM_ERR) { |