cvs: php-src /sapi/cli php_cli_readline.c
| From: | Marcus Boerger | Date: | Mon, 07 Nov 2005 19:12:47 +0000 |
| Subject: | cvs: php-src /sapi/cli php_cli_readline.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35047@lists.php.net to get a copy of this message | ||
helly Mon Nov 7 14:12:47 2005 EDT
Modified files:
/php-src/sapi/cli php_cli_readline.c
Log:
- heredoc handling in -a mode
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.4&r2=1.5&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.4 php-src/sapi/cli/php_cli_readline.c:1.5
--- php-src/sapi/cli/php_cli_readline.c:1.4 Sun Aug 14 09:09:34 2005
+++ php-src/sapi/cli/php_cli_readline.c Mon Nov 7 14:12:37 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.4 2005/08/14 13:09:34 johannes Exp $ */
+/* $Id: php_cli_readline.c,v 1.5 2005/11/07 19:12:37 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -217,8 +217,11 @@
}
break;
case heredoc:
- if (code[i - (heredoc_len + 1)] == '\n' && !strncmp(code + i - heredoc_len,
heredoc_tag, heredoc_len)) {
+ if (code[i - (heredoc_len + 1)] == '\n' && !strncmp(code + i - heredoc_len,
heredoc_tag, heredoc_len) && code[i] == '\n') {
code_type = body;
+ } else if (code[i - (heredoc_len + 2)] == '\n' && !strncmp(code + i -
heredoc_len - 1, heredoc_tag, heredoc_len) && code[i-1] == ';' && code[i]
== '\n') {
+ code_type = body;
+ valid_end = 1;
}
break;
case outside: