archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

readline support #6

Browse source
This commit is contained in:
krakjoe 2013-11-12 04:20:14 +00:00
parent 97d4052bb8
commit 33f0502f19
2 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
phpdbg.h
View file

@ -37,6 +37,11 @@
# include "TSRM.h" # include "TSRM.h"
#endif #endif
#ifdef HAVE_LIBREADLINE
# include <readline/readline.h>
# include <readline/history.h>
#endif
#ifdef ZTS #ifdef ZTS
# define PHPDBG_G(v) TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v) # define PHPDBG_G(v) TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v)
#else #else

48
phpdbg_prompt.c
View file

@ -307,7 +307,7 @@ static PHPDBG_COMMAND(break) /* {{{ */
char *line_pos = NULL; char *line_pos = NULL;
char *func_pos = NULL; char *func_pos = NULL;
if (!expr_len) { if (expr_len <= 0L) {
printf( printf(
"[No expression found]\n"); "[No expression found]\n");
return FAILURE; return FAILURE;
@ -456,7 +456,11 @@ static PHPDBG_COMMAND(help) /* {{{ */
{ {
printf("[Welcome to phpdbg, the interactive PHP debugger, v%s]\n", PHPDBG_VERSION); printf("[Welcome to phpdbg, the interactive PHP debugger, v%s]\n", PHPDBG_VERSION);
if (!expr_len) { if (expr_len > 0L) {
if (phpdbg_do_cmd(phpdbg_help_commands, (char*)expr, expr_len TSRMLS_CC) == FAILURE) {
printf("failed to find help command: %s/%d\n", expr, expr_len);
}
} else {
const phpdbg_command_t *prompt_command = phpdbg_prompt_commands; const phpdbg_command_t *prompt_command = phpdbg_prompt_commands;
const phpdbg_command_t *help_command = phpdbg_help_commands; const phpdbg_command_t *help_command = phpdbg_help_commands;
@ -473,11 +477,8 @@ static PHPDBG_COMMAND(help) /* {{{ */
printf("\t%s\t%s\n", help_command->name, help_command->tip); printf("\t%s\t%s\n", help_command->name, help_command->tip);
++help_command; ++help_command;
} }
} else {
if (phpdbg_do_cmd(phpdbg_help_commands, (char*)expr, expr_len TSRMLS_CC) == FAILURE) {
printf("failed to find help command: %s\n", expr);
}
} }
printf("[Please report bugs to <%s>]\n", PHPDBG_ISSUES); printf("[Please report bugs to <%s>]\n", PHPDBG_ISSUES);
return SUCCESS; return SUCCESS;
@ -571,19 +572,39 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_le
int phpdbg_interactive(TSRMLS_D) /* {{{ */ int phpdbg_interactive(TSRMLS_D) /* {{{ */
{ {
size_t cmd_len;
#ifndef HAVE_LIBREADLINE
char cmd[PHPDBG_MAX_CMD]; char cmd[PHPDBG_MAX_CMD];
phpdbg_interactive_enter:
printf("phpdbg> "); printf("phpdbg> ");
while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING) && while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING) &&
fgets(cmd, PHPDBG_MAX_CMD, stdin) != NULL) { fgets(cmd, PHPDBG_MAX_CMD, stdin) != NULL) {
size_t cmd_len = strlen(cmd) - 1; cmd_len = strlen(cmd) - 1;
#else
char *cmd = NULL;
if (cmd[cmd_len] == '\n') { phpdbg_interactive_enter:
cmd[cmd_len] = 0; while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
} cmd = readline("phpdbg> ");
cmd_len = strlen(cmd);
#endif
/* trim space from end of input */
while (isspace(cmd[cmd_len-1]))
cmd_len--;
/* ensure string is null terminated */
cmd[cmd_len] = '\0';
if (cmd && cmd_len > 0L) {
#ifdef HAVE_LIBREADLINE
add_history(cmd);
#endif
if (cmd_len) {
switch (phpdbg_do_cmd(phpdbg_prompt_commands, cmd, cmd_len TSRMLS_CC)) { switch (phpdbg_do_cmd(phpdbg_prompt_commands, cmd, cmd_len TSRMLS_CC)) {
case FAILURE: case FAILURE:
if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) { if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
@ -598,8 +619,6 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
} }
return PHPDBG_NEXT; return PHPDBG_NEXT;
} }
} }
} else if (PHPDBG_G(last)) { } else if (PHPDBG_G(last)) {
PHPDBG_G(last)->handler( PHPDBG_G(last)->handler(
@ -607,9 +626,8 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
} }
if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) { if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
printf("phpdbg> "); goto phpdbg_interactive_enter;
} }
} }
return SUCCESS; return SUCCESS;