diff options
| author | Johannes Schlüter <johannes@php.net> | 2005-05-17 14:33:15 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2005-05-17 14:33:15 +0000 |
| commit | bb6f4dfc7d5dd9c7441049f597d2d1e488e4ba8f (patch) | |
| tree | 0f58424fb620f5dae26dc02f5bf8984f30ece031 /sapi | |
| parent | 5cd3bd2ea75fe1cf4ac007ed49b228da3bf9b6b0 (diff) | |
| download | php-git-bb6f4dfc7d5dd9c7441049f597d2d1e488e4ba8f.tar.gz | |
- Fix readline loop-condition
- Fix cli_is_valid_code detection
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php_cli.c | 3 | ||||
| -rw-r--r-- | sapi/cli/php_cli_readline.c | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index e7a620980d..165b7e1c69 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -978,12 +978,11 @@ int main(int argc, char *argv[]) history_file = tilde_expand("~/.php_history"); rl_attempted_completion_function = cli_code_completion; - /*rl_completion_append_character = '(';*/ rl_special_prefixes = "$"; read_history(history_file); EG(exit_status) = 0; - while ((line = readline(pos ? prompt : "php > ")) != NULL) { + while ((line = readline(prompt)) != NULL) { if (strcmp(line, "exit") == 0 || strcmp(line, "quit") == 0) { free(line); break; diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c index d10d664a81..23bfea2401 100644 --- a/sapi/cli/php_cli_readline.c +++ b/sapi/cli/php_cli_readline.c @@ -73,7 +73,7 @@ typedef enum { int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) { - int valid_end = 1; + int valid_end = 1, last_valid_end; int brackets_count = 0; int brace_count = 0; int i; @@ -109,6 +109,7 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) valid_end = brace_count == 0 && brackets_count == 0; break; case ' ': + case '\r': case '\n': case '\t': break; @@ -118,6 +119,9 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) case '"': code_type = dstring; break; + case '#': + code_type = comment_line; + break; case '/': if (code[i+1] == '/') { i++; @@ -125,6 +129,8 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) break; } if (code[i+1] == '*') { + last_valid_end = valid_end; + valid_end = 0; code_type = comment_block; i++; break; @@ -190,6 +196,7 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) case comment_block: if (code[i-1] == '*' && code[i] == '/') { code_type = body; + valid_end = last_valid_end; } break; case heredoc_start: |