From 71d3a69425449972f4efdf7228c6f7e49e090755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Thu, 24 Jul 2014 16:53:51 +0200 Subject: Fix bug #55496 Interactive mode doesn't force a newline before the prompt --- ext/readline/readline_cli.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/readline') diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index c2bf8764cb..9655777775 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -99,6 +99,9 @@ static size_t readline_shell_write(const char *str, uint str_length TSRMLS_DC) / static int readline_shell_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */ { + /* We just store the last char here and then pass back to the + caller (sapi_cli_single_write in sapi/cli) which will actually + write due to -1 return code */ php_last_char = str[str_length-1]; return -1; } @@ -667,7 +670,7 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */ pos = 0; if (!pager_pipe && php_last_char != '\0' && php_last_char != '\n') { - readline_shell_write("\n", 1 TSRMLS_CC); + php_write("\n", 1 TSRMLS_CC); } if (EG(exception)) { -- cgit v1.2.1