johannes Tue May 17 10:33:15 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c php_cli_readline.c
Log:
- Fix readline loop-condition
- Fix cli_is_valid_code detection
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.124&r2=1.125&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.124 php-src/sapi/cli/php_cli.c:1.125
--- php-src/sapi/cli/php_cli.c:1.124 Sat May 14 15:33:18 2005
+++ php-src/sapi/cli/php_cli.c Tue May 17 10:33:15 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.124 2005/05/14 19:33:18 helly Exp $ */
+/* $Id: php_cli.c,v 1.125 2005/05/17 14:33:15 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -978,12 +978,11 @@
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;
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.1&r2=1.2&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.1
php-src/sapi/cli/php_cli_readline.c:1.2
--- php-src/sapi/cli/php_cli_readline.c:1.1 Sat May 14 15:33:18 2005
+++ php-src/sapi/cli/php_cli_readline.c Tue May 17 10:33:15 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.1 2005/05/14 19:33:18 helly Exp $ */
+/* $Id: php_cli_readline.c,v 1.2 2005/05/17 14:33:15 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -73,7 +73,7 @@
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 @@
valid_end = brace_count == 0 &&
brackets_count == 0;
break;
case ' ':
+ case '\r':
case '\n':
case '\t':
break;
@@ -118,6 +119,9 @@
case '"':
code_type = dstring;
break;
+ case '#':
+ code_type = comment_line;
+ break;
case '/':
if (code[i+1] == '/') {
i++;
@@ -125,6 +129,8 @@
break;
}
if (code[i+1] == '*') {
+ last_valid_end =
valid_end;
+ valid_end = 0;
code_type =
comment_block;
i++;
break;
@@ -190,6 +196,7 @@
case comment_block:
if (code[i-1] == '*' && code[i] == '/') {
code_type = body;
+ valid_end = last_valid_end;
}
break;
case heredoc_start:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
