Skip to content

Fix phpdbg local console mode when using libedit/readline #13199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix phpdbg local console mode when using libedit/readline #13199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions sapi/phpdbg/phpdbg_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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());
Expand Down