diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-01 16:27:47 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-01 16:27:47 +0000 |
| commit | 6f7619cf6fbfd24af6b90e437d4cde0b7ec33d41 (patch) | |
| tree | dd5a04cfcb5960c19638267d659daa056dcd938e /sapi/cli/php_cli_readline.c | |
| parent | 9158218d3a76256de1adaffd185f1429631b8b20 (diff) | |
| download | php-git-6f7619cf6fbfd24af6b90e437d4cde0b7ec33d41.tar.gz | |
Unicode support: zstr union
Diffstat (limited to 'sapi/cli/php_cli_readline.c')
| -rw-r--r-- | sapi/cli/php_cli_readline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c index 6cd3effcf2..23729d58e6 100644 --- a/sapi/cli/php_cli_readline.c +++ b/sapi/cli/php_cli_readline.c @@ -277,7 +277,7 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC) static char *cli_completion_generator_ht(const char *text, int textlen, int *state, HashTable *ht, void **pData TSRMLS_DC) /* {{{ */ { - char *name; + zstr name; ulong number; if (!(*state % 2)) { @@ -286,12 +286,12 @@ static char *cli_completion_generator_ht(const char *text, int textlen, int *sta } while(zend_hash_has_more_elements(ht) == SUCCESS) { zend_hash_get_current_key(ht, &name, &number, 0); - if (!textlen || (UG(unicode) ? !zend_cmp_unicode_and_string((UChar *)name, (char *)text, textlen) : !strncmp(name, text, textlen))) { + if (!textlen || (UG(unicode) ? !zend_cmp_unicode_and_string(name.u, (char *)text, textlen) : !strncmp(name.s, text, textlen))) { if (pData) { zend_hash_get_current_data(ht, pData); } zend_hash_move_forward(ht); - return name; + return name.s; } if (zend_hash_move_forward(ht) == FAILURE) { break; |