clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Fix GH-13199: Redundant prompt in phpdbg with libedit/readline
This commit is contained in:
Peter Kokot 2024-08-02 08:38:35 +02:00
commit 0339d8c589
No known key found for this signature in database
GPG Key ID: A94800907AA79B36
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sapi/phpdbg/phpdbg_cmd.c
View File

@ -23,6 +23,10 @@
#include "phpdbg_prompt.h"
#include "phpdbg_io.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
static inline const char *phpdbg_command_name(const phpdbg_command_t *command, char *buffer) {
@ -745,17 +749,29 @@ PHPDBG_API char *phpdbg_read_input(const char *buffered) /* {{{ */
if ((PHPDBG_G(flags) & (PHPDBG_IS_STOPPING | PHPDBG_IS_RUNNING)) != PHPDBG_IS_STOPPING) {
if (buffered == NULL) {
#ifdef HAVE_PHPDBG_READLINE
char *cmd = readline(phpdbg_get_prompt());
PHPDBG_G(last_was_newline) = 1;
# ifdef HAVE_UNISTD_H
/* EOF makes readline write prompt again in local console mode and
ignored if compiled without readline integration. */
if (!isatty(PHPDBG_G(io)[PHPDBG_STDIN].fd)) {
char buf[PHPDBG_MAX_CMD];
phpdbg_write("%s", phpdbg_get_prompt());
phpdbg_consume_stdin_line(buf);
buffer = estrdup(buf);
} else
# endif
{
char *cmd = readline(phpdbg_get_prompt());
PHPDBG_G(last_was_newline) = 1;
if (!cmd) {
PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
zend_bailout();
if (!cmd) {
PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
zend_bailout();
}
add_history(cmd);
buffer = estrdup(cmd);
free(cmd);
}
add_history(cmd);
buffer = estrdup(cmd);
free(cmd);
#else
char buf[PHPDBG_MAX_CMD];
phpdbg_write("%s", phpdbg_get_prompt());