moriyoshi Tue Dec 31 14:13:16 2002 EDT
Modified files:
/php4/ext/iconv iconv.c php_iconv.h
Log:
Added various functions that relies on the iconv facility:
iconv_strlen(), iconv_substr(), iconv_strpos(), iconv_strrpos(),
iconv_mime_encode(), iconv_mime_decode()
# hope this be a new year gift for you. Happy new year!
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.67 php4/ext/iconv/iconv.c:1.68
--- php4/ext/iconv/iconv.c:1.67 Tue Dec 31 11:06:43 2002
+++ php4/ext/iconv/iconv.c Tue Dec 31 14:13:16 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.67 2002/12/31 16:06:43 sebastian Exp $ */
+/* $Id: iconv.c,v 1.68 2002/12/31 19:13:16 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,6 +30,10 @@
#include "SAPI.h"
#include "php_ini.h"
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
#include <errno.h>
#include "php_iconv.h"
@@ -46,6 +50,9 @@
#include <gnu/libc-version.h>
#endif
+#include "ext/standard/php_smart_str.h"
+#include "ext/standard/base64.h"
+
#ifdef HAVE_LIBICONV
#define LIBICONV_PLUG
#define icv_open(a, b) libiconv_open(a, b)
@@ -57,6 +64,9 @@
#define icv(a, b, c, d, e) iconv(a, (char **) b, c, d, e)
#endif
+#define _php_iconv_memequal(a, b, c) \
+ ((c) == sizeof(unsigned long) ? *((unsigned long *)(a)) == *((unsigned long *)(b))
+: ((c) == sizeof(unsigned int) ? *((unsigned int *)(a)) == *((unsigned int *)(b)) :
+memcmp(a, b, c) == 0))
+
/* {{{ iconv_functions[]
*/
function_entry iconv_functions[] = {
@@ -64,6 +74,12 @@
PHP_FE(ob_iconv_handler, NULL)
PHP_FE(iconv_get_encoding, NULL)
PHP_FE(iconv_set_encoding, NULL)
+ PHP_FE(iconv_strlen, NULL)
+ PHP_FE(iconv_substr, NULL)
+ PHP_FE(iconv_strpos, NULL)
+ PHP_FE(iconv_strrpos, NULL)
+ PHP_FE(iconv_mime_encode, NULL)
+ PHP_FE(iconv_mime_decode, NULL)
{NULL, NULL, NULL}
};
/* }}} */
@@ -98,13 +114,41 @@
PHP_ICONV_ERR_TOO_BIG = 3,
PHP_ICONV_ERR_ILLEGAL_SEQ = 4,
PHP_ICONV_ERR_ILLEGAL_CHAR = 5,
- PHP_ICONV_ERR_UNKNOWN = 6
+ PHP_ICONV_ERR_UNKNOWN = 6,
+ PHP_ICONV_ERR_MALFORMED = 7
} php_iconv_err_t;
/* }}} */
+/* {{{ typedef enum php_iconv_enc_scheme_t */
+typedef enum _php_iconv_enc_scheme_t {
+ PHP_ICONV_ENC_SCHEME_BASE64,
+ PHP_ICONV_ENC_SCHEME_QPRINT
+} php_iconv_enc_scheme_t;
+/* }}} */
+
/* {{{ prototypes */
-static php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char **out,
size_t *out_len, const char *in_charset, const char *out_charset);
-static void _php_iconv_show_error(php_iconv_err_t err, const char *in_charset, const
char *out_charset TSRMLS_DC);
+static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l,
+iconv_t cd);
+static php_iconv_err_t _php_iconv_appendc(smart_str *d, const char c, iconv_t cd);
+
+static php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char **out,
+size_t *out_len, const char *out_charset, const char *in_charset);
+
+static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset, const
+char *in_charset TSRMLS_DC);
+
+static php_iconv_err_t _php_iconv_strlen(unsigned int *pretval, const char *str,
+size_t nbytes, const char *enc);
+
+static php_iconv_err_t _php_iconv_substr(smart_str *pretval, const char *str, size_t
+nbytes, int offset, int len, const char *enc);
+
+static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval, const char *haystk,
+size_t haystk_nbytes, const char *ndl, size_t ndl_nbytes, int offset, const char
+*enc);
+
+static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fname,
+size_t fname_nbytes, const char *fval, size_t fval_nbytes, unsigned int max_line_len,
+const char *lfchars, php_iconv_enc_scheme_t enc_scheme, const char *out_charset,
+const char *enc);
+
+static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *str,
+size_t str_nbytes, const char *enc);
+/* }}} */
+
+/* {{{ static globals */
+static char _generic_superset_name[] = "UCS-4LE";
+#define GENERIC_SUPERSET_NAME _generic_superset_name
+#define GENERIC_SUPERSET_NBYTES 4
/* }}} */
/* {{{ PHP_INI
@@ -186,11 +230,139 @@
}
/* }}} */
-/* {{{ php_iconv_string
+unsigned char *php_quot_print_decode(const unsigned char *str, size_t length, size_t
+*ret_length)
+{
+ register unsigned int i;
+ register unsigned const char *p1;
+ register unsigned char *p2;
+ register unsigned int h_nbl, l_nbl;
+
+ size_t decoded_len;
+ unsigned char *retval;
+
+ unsigned int hexval_tbl[256] = {
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 16, 16, 16, 16, 16,
+ 16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
+ };
+
+ i = length, p1 = str; decoded_len = length;
+
+ while (i > 0 && *p1 != '\0') {
+ if (*p1 == '=') {
+ decoded_len -= 2;
+ p1 += 2;
+ i -= 2;
+ }
+ p1++;
+ i--;
+ }
+
+ retval = emalloc(decoded_len + 1);
+ i = length; p1 = str; p2 = retval;
+
+ while (i > 0 && *p1 != '\0') {
+ if (*p1 == '=') {
+ if (i < 2 ||
+ (h_nbl = hexval_tbl[p1[1]]) > 15 ||
+ (l_nbl = hexval_tbl[p1[2]]) > 15) {
+
+ efree(retval);
+ return NULL;
+ }
+
+ *(p2++) = (h_nbl << 4) | l_nbl;
+ i -= 3;
+ p1 += 3;
+ } else {
+ *(p2++) = *p1;
+ i--;
+ p1++;
+ }
+ }
+
+ *p2 = '\0';
+ *ret_length = decoded_len;
+ return retval;
+}
+
+/* {{{ _php_iconv_appendl() */
+static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l,
+iconv_t cd)
+{
+ const char *in_p = s;
+ size_t in_left = l;
+ char *out_p;
+ size_t out_left = 0;
+ size_t buf_growth = 128;
+#if !ICONV_SUPPORTS_ERRNO
+ size_t prev_in_left = in_left;
+#endif
+
+ while (in_left > 0) {
+ out_left = buf_growth - out_left;
+ {
+ size_t newlen;
+ smart_str_alloc((d), out_left, 0);
+ }
+
+ out_p = (d)->c + (d)->len;
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ return PHP_ICONV_ERR_ILLEGAL_CHAR;
+
+ case EILSEQ:
+ return PHP_ICONV_ERR_ILLEGAL_SEQ;
+
+ case E2BIG:
+ break;
+
+ default:
+ return PHP_ICONV_ERR_UNKNOWN;
+ }
+#else
+ if (prev_in_left == in_left) {
+ return PHP_ICONV_ERR_UNKNOWN;
+ }
+#endif
+ }
+#if !ICONV_SUPPORTS_ERRNO
+ prev_in_left = in_left;
+#endif
+ (d)->len += (buf_growth - out_left);
+ buf_growth <<= 1;
+ }
+ return PHP_ICONV_ERR_SUCCESS;
+}
+/* }}} */
+
+/* {{{ _php_iconv_appendc() */
+static php_iconv_err_t _php_iconv_appendc(smart_str *d, const char c, iconv_t cd)
+{
+ return _php_iconv_appendl(d, &c, 1, cd);
+}
+/* }}} */
+
+/* {{{ php_iconv_string()
*/
php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
char **out, size_t *out_len,
- const char *in_charset, const
char *out_charset)
+ const char *out_charset, const
+char *in_charset)
{
#if !ICONV_SUPPORTS_ERRNO
unsigned int in_size, out_size, out_left;
@@ -319,8 +491,841 @@
}
/* }}} */
+/* {{{ _php_iconv_strlen() */
+static php_iconv_err_t _php_iconv_strlen(unsigned int *pretval, const char *str,
+size_t nbytes, const char *enc)
+{
+ char buf[GENERIC_SUPERSET_NBYTES*2];
+
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
+
+ iconv_t cd;
+
+ const char *in_p;
+ size_t in_left;
+
+ char *out_p;
+ size_t out_left;
+
+ unsigned int cnt;
+
+ *pretval = (unsigned int)-1;
+
+ cd = icv_open(GENERIC_SUPERSET_NAME, enc);
+
+ if (cd == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ return PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ return PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ return PHP_ICONV_ERR_UNKNOWN;
+#endif
+ }
+
+ out_left = 0;
+
+ for (in_p = str, in_left = nbytes, cnt = 0; in_left > 0; cnt+=2) {
+ size_t prev_in_left;
+ out_p = buf;
+ out_left = sizeof(buf);
+
+ prev_in_left = in_left;
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (prev_in_left == in_left) {
+ break;
+ }
+ }
+ }
+
+ if (out_left > 0) {
+ cnt -= out_left / GENERIC_SUPERSET_NBYTES;
+ }
+
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ err = PHP_ICONV_ERR_ILLEGAL_CHAR;
+ break;
+
+ case EILSEQ:
+ err = PHP_ICONV_ERR_ILLEGAL_SEQ;
+ break;
+
+ case E2BIG:
+ *pretval = cnt;
+ break;
+
+ default:
+ err = PHP_ICONV_ERR_UNKNOWN;
+ break;
+ }
+#else
+ *pretval = cnt;
+#endif
+
+ icv_close(cd);
+
+ return err;
+}
+
+/* }}} */
+
+/* {{{ _php_iconv_substr() */
+static php_iconv_err_t _php_iconv_substr(smart_str *pretval,
+ const char *str, size_t nbytes, int offset, int len, const char *enc)
+{
+ char buf[GENERIC_SUPERSET_NBYTES];
+
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
+
+ iconv_t cd;
+
+ const char *in_p;
+ size_t in_left;
+
+ char *out_p;
+ size_t out_left;
+
+ unsigned int cnt;
+
+ const char *substr_ofs;
+
+ /* normalize the offset and the length */
+ if (offset < 0 || len < 0) {
+ unsigned int total_len;
+ err = _php_iconv_strlen(&total_len, str, nbytes, enc);
+ if (err != PHP_ICONV_ERR_SUCCESS) {
+ return err;
+ }
+ if (offset < 0) {
+ if ((offset += total_len) < 0) {
+ offset = 0;
+ }
+ }
+ if (len < 0) {
+ if ((len += (total_len - offset)) < 0) {
+ len = 0;
+ }
+ }
+ }
+
+ cd = icv_open(GENERIC_SUPERSET_NAME, enc);
+
+ if (cd == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ return PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ return PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ return PHP_ICONV_ERR_UNKNOWN;
+#endif
+ }
+
+ substr_ofs = NULL;
+
+ for (in_p = str, in_left = nbytes, cnt = 0; in_left > 0 && len > 0; ++cnt) {
+ size_t prev_in_left;
+ out_p = buf;
+ out_left = sizeof(buf);
+
+ prev_in_left = in_left;
+
+ if (cnt >= offset) {
+ if (substr_ofs == NULL) {
+ substr_ofs = in_p;
+ }
+ --len;
+ }
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (prev_in_left == in_left) {
+ break;
+ }
+ }
+ }
+
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ err = PHP_ICONV_ERR_ILLEGAL_CHAR;
+ break;
+
+ case EILSEQ:
+ err = PHP_ICONV_ERR_ILLEGAL_SEQ;
+ break;
+
+ case E2BIG:
+ break;
+
+ default:
+ err = PHP_ICONV_ERR_UNKNOWN;
+ break;
+ }
+#endif
+ if (err == PHP_ICONV_ERR_SUCCESS) {
+ if (substr_ofs != NULL) {
+ smart_str_appendl(pretval, substr_ofs, (size_t)(in_p -
+substr_ofs));
+ }
+ smart_str_0(pretval);
+ }
+
+ icv_close(cd);
+
+ return err;
+}
+
+/* }}} */
+
+/* {{{ _php_iconv_strpos() */
+static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval,
+ const char *haystk, size_t haystk_nbytes,
+ const char *ndl, size_t ndl_nbytes,
+ int offset, const char *enc)
+{
+ char buf[GENERIC_SUPERSET_NBYTES];
+
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
+
+ iconv_t cd;
+
+ const char *in_p;
+ size_t in_left;
+
+ char *out_p;
+ size_t out_left;
+
+ unsigned int cnt;
+
+ char *ndl_buf;
+ const char *ndl_buf_p;
+ size_t ndl_buf_len, ndl_buf_left;
+
+ unsigned int match_ofs;
+
+ *pretval = (unsigned int)-1;
+
+ err = php_iconv_string(ndl, ndl_nbytes,
+ &ndl_buf, &ndl_buf_len, GENERIC_SUPERSET_NAME, enc);
+
+ if (err != PHP_ICONV_ERR_SUCCESS) {
+ if (ndl_buf != NULL) {
+ efree(ndl_buf);
+ }
+ return err;
+ }
+
+ cd = icv_open(GENERIC_SUPERSET_NAME, enc);
+
+ if (cd == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ return PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ return PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ return PHP_ICONV_ERR_UNKNOWN;
+#endif
+ }
+
+ ndl_buf_p = ndl_buf;
+ ndl_buf_left = ndl_buf_len;
+ match_ofs = (unsigned int)-1;
+
+ for (in_p = haystk, in_left = haystk_nbytes, cnt = 0; in_left > 0; ++cnt) {
+ size_t prev_in_left;
+ out_p = buf;
+ out_left = sizeof(buf);
+
+ prev_in_left = in_left;
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (prev_in_left == in_left) {
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ err = PHP_ICONV_ERR_ILLEGAL_CHAR;
+ break;
+
+ case EILSEQ:
+ err = PHP_ICONV_ERR_ILLEGAL_SEQ;
+ break;
+
+ case E2BIG:
+ break;
+
+ default:
+ err = PHP_ICONV_ERR_UNKNOWN;
+ break;
+ }
+#endif
+ break;
+ }
+ }
+ if (offset >= 0) {
+ if (cnt >= offset) {
+ if (_php_iconv_memequal(buf, ndl_buf_p, sizeof(buf))) {
+ if (match_ofs == (unsigned int)-1) {
+ match_ofs = cnt;
+ }
+ ndl_buf_p += GENERIC_SUPERSET_NBYTES;
+ ndl_buf_left -= GENERIC_SUPERSET_NBYTES;
+ if (ndl_buf_left == 0) {
+ *pretval = match_ofs;
+ break;
+ }
+ } else {
+ unsigned int i, j, lim;
+
+ i = 0;
+ j = GENERIC_SUPERSET_NBYTES;
+ lim = (unsigned int)(ndl_buf_p - ndl_buf);
+
+ while (j < lim) {
+ if (_php_iconv_memequal(&ndl_buf[j],
+&ndl_buf[i],
+ GENERIC_SUPERSET_NBYTES)) {
+ i += GENERIC_SUPERSET_NBYTES;
+ } else {
+ j -= i;
+ i = 0;
+ }
+ j += GENERIC_SUPERSET_NBYTES;
+ }
+
+ if (!_php_iconv_memequal(buf, &ndl_buf[i],
+sizeof(buf))) {
+ i = 0;
+ }
+
+ if (i == 0) {
+ match_ofs = (unsigned int)-1;
+ } else {
+ match_ofs += (lim - i) /
+GENERIC_SUPERSET_NBYTES;
+ i += GENERIC_SUPERSET_NBYTES;
+ }
+ ndl_buf_p = &ndl_buf[i];
+ ndl_buf_left = ndl_buf_len - i;
+ }
+ }
+ } else {
+ if (_php_iconv_memequal(buf, ndl_buf_p, sizeof(buf))) {
+ if (match_ofs == (unsigned int)-1) {
+ match_ofs = cnt;
+ }
+ ndl_buf_p += GENERIC_SUPERSET_NBYTES;
+ ndl_buf_left -= GENERIC_SUPERSET_NBYTES;
+ if (ndl_buf_left == 0) {
+ *pretval = match_ofs;
+ }
+ } else {
+ unsigned int i, j, lim;
+
+ i = 0;
+ j = GENERIC_SUPERSET_NBYTES;
+ lim = (unsigned int)(ndl_buf_p - ndl_buf);
+
+ while (j < lim) {
+ if (_php_iconv_memequal(&ndl_buf[j],
+&ndl_buf[i],
+ GENERIC_SUPERSET_NBYTES)) {
+ i += GENERIC_SUPERSET_NBYTES;
+ } else {
+ j -= i;
+ i = 0;
+ }
+ j += GENERIC_SUPERSET_NBYTES;
+ }
+
+ if (!_php_iconv_memequal(buf, &ndl_buf[i],
+sizeof(buf))) {
+ i = 0;
+ }
+
+ if (i == 0) {
+ match_ofs = (unsigned int)-1;
+ } else {
+ match_ofs += (lim - i) /
+GENERIC_SUPERSET_NBYTES;
+ i += GENERIC_SUPERSET_NBYTES;
+ }
+ ndl_buf_p = &ndl_buf[i];
+ ndl_buf_left = ndl_buf_len - i;
+ }
+ }
+ }
+
+ if (ndl_buf) {
+ efree(ndl_buf);
+ }
+
+ icv_close(cd);
+
+ return err;
+}
+/* }}} */
+
+/* {{{ _php_iconv_mime_encode() */
+static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fname,
+size_t fname_nbytes, const char *fval, size_t fval_nbytes, unsigned int max_line_len,
+const char *lfchars, php_iconv_enc_scheme_t enc_scheme, const char *out_charset,
+const char *enc)
+{
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
+ iconv_t cd = (iconv_t)(-1), cd_pl = (iconv_t)(-1);
+ unsigned int char_cnt = 0;
+ size_t out_charset_len;
+ size_t lfchars_len;
+ char *buf = NULL;
+ char *encoded = NULL;
+ size_t encoded_len;
+ const char *in_p;
+ size_t in_left;
+ char *out_p;
+ size_t out_left;
+
+ out_charset_len = strlen(out_charset);
+ lfchars_len = strlen(lfchars);
+
+ if ((fname_nbytes + 2) >= max_line_len
+ || (out_charset_len + 12) >= max_line_len) {
+ /* field name is too long */
+ err = PHP_ICONV_ERR_TOO_BIG;
+ goto out;
+ }
+
+ cd_pl = icv_open("ASCII", enc);
+ if (cd_pl == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ err = PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ err = PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ err = PHP_ICONV_ERR_UNKNOWN;
+#endif
+ goto out;
+ }
+
+ cd = icv_open(out_charset, enc);
+ if (cd == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ err = PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ err = PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ err = PHP_ICONV_ERR_UNKNOWN;
+#endif
+ goto out;
+ }
+
+ buf = emalloc(max_line_len + 5);
+
+ char_cnt = max_line_len;
+
+ _php_iconv_appendl(pretval, fname, fname_nbytes, cd_pl);
+ char_cnt -= fname_nbytes;
+ smart_str_appendl(pretval, ": ", sizeof(": ") - 1);
+ char_cnt -= 2;
+
+ in_p = fval;
+ in_left = fval_nbytes;
+
+ do {
+ size_t prev_in_left = in_left;
+ size_t out_size;
+
+ if (char_cnt < (out_charset_len + 12)) {
+ /* lfchars must be encoded in ASCII here*/
+ smart_str_appendl(pretval, lfchars, lfchars_len);
+ smart_str_appendc(pretval, ' ');
+ char_cnt = max_line_len - 1;
+ }
+
+ smart_str_appendl(pretval, "=?", sizeof("=?") - 1);
+ char_cnt -= 2;
+ smart_str_appendl(pretval, out_charset, out_charset_len);
+ char_cnt -= out_charset_len;
+ smart_str_appendc(pretval, '?');
+ char_cnt --;
+
+ switch (enc_scheme) {
+ case PHP_ICONV_ENC_SCHEME_BASE64: {
+ smart_str_appendc(pretval, 'B');
+ char_cnt--;
+ smart_str_appendc(pretval, '?');
+ char_cnt--;
+
+ out_p = buf;
+ out_left = out_size = (char_cnt - 2) / 4 * 3;
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p,
+&out_left) == -1) {
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ err =
+PHP_ICONV_ERR_ILLEGAL_CHAR;
+ goto out;
+
+ case EILSEQ:
+ err =
+PHP_ICONV_ERR_ILLEGAL_SEQ;
+ goto out;
+
+ case E2BIG:
+ break;
+
+ default:
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+#else
+ if (prev_in_left == in_left) {
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+#endif
+ }
+ prev_in_left = in_left;
+
+ encoded = php_base64_encode(buf, (int)(out_size -
+out_left), &encoded_len);
+ if (char_cnt < encoded_len) {
+ /* something went wrong! */
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+
+ smart_str_appendl(pretval, encoded, encoded_len);
+ char_cnt -= encoded_len;
+ smart_str_appendl(pretval, "?=", sizeof("?=") - 1);
+ char_cnt -= 2;
+
+ efree(encoded);
+ encoded = NULL;
+ icv_close(cd);
+
+ /* reconstruct the converter */
+ cd = icv_open(out_charset, enc);
+ if (cd == (iconv_t)(-1)) {
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+
+ } break; /* case PHP_ICONV_ENC_SCHEME_BASE64: */
+
+ case PHP_ICONV_ENC_SCHEME_QPRINT: {
+ smart_str_appendc(pretval, 'Q');
+ char_cnt--;
+ smart_str_appendc(pretval, '?');
+ char_cnt--;
+
+ prev_in_left = in_left;
+
+ while (in_left > 0) {
+ out_p = buf;
+ out_left = out_size = 1;
+
+ if (icv(cd, &in_p, &in_left, (char **) &out_p,
+&out_left) == -1) {
+#if ICONV_SUPPORTS_ERRNO
+ switch (errno) {
+ case EINVAL:
+ err =
+PHP_ICONV_ERR_ILLEGAL_CHAR;
+ goto out;
+
+ case EILSEQ:
+ err =
+PHP_ICONV_ERR_ILLEGAL_SEQ;
+ goto out;
+
+ case E2BIG:
+ break;
+
+ default:
+ err =
+PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+#else
+ if (prev_in_left == in_left) {
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+#endif
+ }
+
+ if (out_size > out_left) {
+ if ((buf[0] >= 33 && buf[0] <= 60) ||
+ (buf[0] >= 62 && buf[0] <=
+126)) {
+
+ if (char_cnt >= 1 + 2) {
+
+smart_str_appendc(pretval, buf[0]);
+ char_cnt--;
+ } else {
+ in_p -= (prev_in_left
+- in_left);
+ in_left = prev_in_left;
+
+ break;
+ }
+ } else {
+ if (char_cnt >= 3 + 2) {
+ static char
+qp_digits[] = "0123456789ABCDEF";
+
+smart_str_appendc(pretval, '=');
+
+smart_str_appendc(pretval, qp_digits[(buf[0] >> 4) & 0x0f]);
+
+smart_str_appendc(pretval, qp_digits[(buf[0] & 0x0f)]);
+ char_cnt -= 3;
+ } else {
+ in_p -= (prev_in_left
+- in_left);
+ in_left = prev_in_left;
+
+ break;
+ }
+ }
+ }
+ prev_in_left = in_left;
+ }
+
+ smart_str_appendl(pretval, "?=", sizeof("?=") - 1);
+ char_cnt -= 2;
+
+ icv_close(cd);
+
+ /* reconstruct the converter */
+ cd = icv_open(out_charset, enc);
+ if (cd == (iconv_t)(-1)) {
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+
+ } break; /* case PHP_ICONV_ENC_SCHEME_BASE64: */
+ }
+ } while (in_left > 0);
+
+ smart_str_0(pretval);
+
+out:
+ if (cd != (iconv_t)(-1)) {
+ icv_close(cd);
+ }
+ if (cd_pl != (iconv_t)(-1)) {
+ icv_close(cd_pl);
+ }
+ if (encoded != NULL) {
+ efree(encoded);
+ }
+ if (buf != NULL) {
+ efree(buf);
+ }
+ return err;
+}
+/* }}} */
+
+/* {{{ _php_iconv_mime_decode() */
+static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *str,
+size_t str_nbytes, const char *enc)
+{
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
+
+ iconv_t cd = (iconv_t)(-1), cd_pl = (iconv_t)(-1);
+
+ const char *p1;
+ size_t str_left;
+ unsigned int scan_stat = 0;
+ const char *csname = NULL;
+ size_t csname_len;
+ const char *encoded_text = NULL;
+ size_t encoded_text_len;
+
+ php_iconv_enc_scheme_t enc_scheme;
+
+ cd_pl = icv_open(enc, "ASCII");
+
+ if (cd_pl == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ err = PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ err = PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ err = PHP_ICONV_ERR_UNKNOWN;
+#endif
+ goto out;
+ }
+
+ p1 = str;
+ for (str_left = str_nbytes; str_left > 0; str_left--, p1++) {
+
+ switch (scan_stat) {
+ case 0:
+ if (*p1 == '\r') {
+ scan_stat = 7;
+ } else if (*p1 == '\n') {
+ scan_stat = 8;
+ } else if (*p1 == '=') {
+ scan_stat = 1;
+ } else {
+ _php_iconv_appendc(pretval, *p1, cd_pl);
+ }
+ break;
+
+ case 1:
+ if (*p1 != '?') {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+ csname = p1 + 1;
+ scan_stat = 2;
+ break;
+
+ case 2: /* charset name */
+ if (*p1 == '?') {
+ char tmpbuf[80];
+
+ if (csname == NULL) {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+
+ csname_len = (size_t)(p1 - csname);
+
+ if (csname_len > sizeof(tmpbuf) - 1) {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+
+ memcpy(tmpbuf, csname, csname_len);
+ tmpbuf[csname_len] = '\0';
+
+ if (cd != (iconv_t)(-1)) {
+ icv_close(cd);
+ }
+
+ cd = icv_open(enc, tmpbuf);
+
+ if (cd == (iconv_t)(-1)) {
+#if ICONV_SUPPORTS_ERRNO
+ if (errno == EINVAL) {
+ err =
+PHP_ICONV_ERR_WRONG_CHARSET;
+ } else {
+ err = PHP_ICONV_ERR_CONVERTER;
+ }
+#else
+ err = PHP_ICONV_ERR_UNKNOWN;
+#endif
+ goto out;
+ }
+
+ scan_stat = 3;
+ }
+ break;
+
+ case 3:
+ switch (*p1) {
+ case 'B':
+ enc_scheme =
+PHP_ICONV_ENC_SCHEME_BASE64;
+ break;
+
+ case 'Q':
+ enc_scheme =
+PHP_ICONV_ENC_SCHEME_QPRINT;
+ break;
+
+ default:
+ err = PHP_ICONV_ERR_MALFORMED;
+
+ goto out;
+ }
+ scan_stat = 4;
+ break;
+
+ case 4:
+ if (*p1 != '?') {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+ encoded_text = p1 + 1;
+ scan_stat = 5;
+ break;
+
+ case 5:
+ if (*p1 == '?') {
+ char *decoded_text;
+ size_t decoded_text_len;
+
+ if (encoded_text == NULL) {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+
+ encoded_text_len = (size_t)(p1 - encoded_text);
+ switch (enc_scheme) {
+ case PHP_ICONV_ENC_SCHEME_BASE64:
+ decoded_text = (char
+*)php_base64_decode((unsigned char*)encoded_text, (int)encoded_text_len,
+&decoded_text_len);
+ break;
+
+ case PHP_ICONV_ENC_SCHEME_QPRINT:
+ decoded_text = (char
+*)php_quot_print_decode((unsigned char*)encoded_text, (int)encoded_text_len,
+&decoded_text_len);
+ break;
+ }
+
+ if (decoded_text == NULL) {
+ err = PHP_ICONV_ERR_UNKNOWN;
+ goto out;
+ }
+
+ err = _php_iconv_appendl(pretval,
+decoded_text, decoded_text_len, cd);
+ efree(decoded_text);
+ if (err != PHP_ICONV_ERR_SUCCESS) {
+ goto out;
+ }
+ scan_stat = 6;
+ }
+ break;
+
+ case 6:
+ if (*p1 != '=') {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+ scan_stat = 0;
+ break;
+
+ case 7:
+ if (*p1 == '\n') {
+ scan_stat = 8;
+ } else {
+ /* bare CR */
+ _php_iconv_appendc(pretval, '\r', cd_pl);
+ _php_iconv_appendc(pretval, *p1, cd_pl);
+ }
+ break;
+
+ case 8:
+ if (*p1 != ' ' && *p1 != '\t') {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+ scan_stat = 9;
+ break;
+
+ case 9:
+ if (*p1 == '=') {
+ scan_stat = 1;
+ } else if (*p1 != ' ' && *p1 != '\t') {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
+ }
+ break;
+ }
+ }
+
+ smart_str_0(pretval);
+out:
+ if (cd != (iconv_t)(-1)) {
+ icv_close(cd);
+ }
+ if (cd_pl != (iconv_t)(-1)) {
+ icv_close(cd_pl);
+ }
+ return err;
+}
+/* }}} */
+
/* {{{ php_iconv_show_error() */
-static void _php_iconv_show_error(php_iconv_err_t err, const char *in_charset, const
char *out_charset TSRMLS_DC)
+static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset, const
+char *in_charset TSRMLS_DC)
{
switch (err) {
case PHP_ICONV_ERR_SUCCESS:
@@ -356,6 +1361,255 @@
}
/* }}} */
+/* {{{ proto int iconv_strlen(string str [, string charset])
+ Returns the character count of str */
+PHP_FUNCTION(iconv_strlen)
+{
+ char *charset;
+ long charset_len;
+ char *str;
+ long str_len;
+
+ php_iconv_err_t err;
+
+ unsigned int retval;
+
+ charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
+ &str, &str_len, &charset, &charset_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ err = _php_iconv_strlen(&retval, str, str_len, charset);
+ _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
+ if (err == PHP_ICONV_ERR_SUCCESS) {
+ RETVAL_LONG(retval);
+ } else {
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto string iconv_substr(string str, int offset, [int length, string charset])
+ Returns specified part of a string */
+PHP_FUNCTION(iconv_substr)
+{
+ char *charset;
+ long charset_len;
+ char *str;
+ long str_len;
+ long offset, length;
+ zval *len_z = NULL;
+
+ php_iconv_err_t err;
+
+ smart_str retval = {0};
+
+ charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|zs",
+ &str, &str_len, &offset, &len_z,
+ &charset, &charset_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (len_z == NULL) {
+ length = str_len;
+ } else {
+ convert_to_long_ex(&len_z);
+ length = Z_LVAL_P(len_z);
+ }
+
+ err = _php_iconv_substr(&retval, str, str_len, offset, length, charset);
+ _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
+
+ if (err == PHP_ICONV_ERR_SUCCESS && str != NULL) {
+ if (retval.c != NULL) {
+ RETVAL_STRINGL(retval.c, retval.len, 0);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+ } else {
+ smart_str_free(&retval);
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto string iconv_strpos(string haystack, string needle, int offset [, string
+charset])
+ Finds position of first occurrence of needle within part of haystack beginning
+with offset */
+PHP_FUNCTION(iconv_strpos)
+{
+ char *charset;
+ long charset_len;
+ char *haystk;
+ long haystk_len;
+ char *ndl;
+ long ndl_len;
+ long offset;
+
+ php_iconv_err_t err;
+
+ unsigned int retval;
+
+ offset = 0;
+ charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls",
+ &haystk, &haystk_len, &ndl, &ndl_len,
+ &offset, &charset, &charset_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ err = _php_iconv_strpos(&retval, haystk, haystk_len, ndl, ndl_len,
+ offset, charset);
+ _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
+
+ if (err == PHP_ICONV_ERR_SUCCESS && retval != (unsigned int)-1) {
+ RETVAL_LONG((long)retval);
+ } else {
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto string iconv_strrpos(string haystack, string needle [, string charset])
+ Finds position of last occurrence of needle within part of haystack beginning with
+offset */
+PHP_FUNCTION(iconv_strrpos)
+{
+ char *charset;
+ long charset_len;
+ char *haystk;
+ long haystk_len;
+ char *ndl;
+ long ndl_len;
+
+ php_iconv_err_t err;
+
+ unsigned int retval;
+
+ charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s",
+ &haystk, &haystk_len, &ndl, &ndl_len,
+ &charset, &charset_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ err = _php_iconv_strpos(&retval, haystk, haystk_len, ndl, ndl_len,
+ -1, charset);
+ _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
+
+ if (err == PHP_ICONV_ERR_SUCCESS && retval != (unsigned int)-1) {
+ RETVAL_LONG((long)retval);
+ } else {
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto string iconv_mime_encode(string field_name, string field_value, string
+scheme, string out_charset [, string in_charset, int line_len, string lfchars])
+ Composes a mime header field with field_name and field_value in a specified scheme
+*/
+PHP_FUNCTION(iconv_mime_encode)
+{
+ char *field_name;
+ long field_name_len;
+ char *field_value;
+ long field_value_len;
+ char *scheme;
+ long scheme_len;
+ char *in_charset;
+ long in_charset_len;
+ char *out_charset;
+ long out_charset_len;
+ long line_len = 76;
+ char *lfchars = "\r\n";
+ long lfchars_len = sizeof("\r\n")-1;
+
+ php_iconv_enc_scheme_t scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
+
+ smart_str retval = {0};
+
+ php_iconv_err_t err;
+
+ in_charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss|sls",
+ &field_name, &field_name_len, &field_value, &field_value_len,
+ &scheme, &scheme_len, &out_charset, &out_charset_len,
+ &in_charset, &in_charset_len, &line_len, &lfchars, &lfchars_len) ==
+FAILURE) {
+
+ RETURN_FALSE;
+ }
+
+ if (scheme_len > 0) {
+ switch (scheme[0]) {
+ case 'B': case 'b':
+ scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
+ break;
+
+ case 'Q': case 'q':
+ scheme_id = PHP_ICONV_ENC_SCHEME_QPRINT;
+ break;
+ }
+ }
+
+ err = _php_iconv_mime_encode(&retval, field_name, field_name_len,
+ field_value, field_value_len, line_len, lfchars, scheme_id,
+ out_charset, in_charset);
+ _php_iconv_show_error(err, out_charset, in_charset TSRMLS_CC);
+
+ if (err == PHP_ICONV_ERR_SUCCESS) {
+ if (retval.c != NULL) {
+ RETVAL_STRINGL(retval.c, retval.len, 0);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+ } else {
+ smart_str_free(&retval);
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto string iconv_mime_decode(string encoded_string [, string charset])
+ Decodes a mime header field */
+PHP_FUNCTION(iconv_mime_decode)
+{
+ char *encoded_str;
+ long encoded_str_len;
+ char *charset;
+ long charset_len;
+
+ smart_str retval = {0};
+
+ php_iconv_err_t err;
+
+ charset = ICONVG(internal_encoding);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
+ &encoded_str, &encoded_str_len, &charset, &charset_len) == FAILURE) {
+
+ RETURN_FALSE;
+ }
+
+ err = _php_iconv_mime_decode(&retval, encoded_str, encoded_str_len, charset);
+ _php_iconv_show_error(err, charset, "???" TSRMLS_CC);
+
+ if (err == PHP_ICONV_ERR_SUCCESS) {
+ if (retval.c != NULL) {
+ RETVAL_STRINGL(retval.c, retval.len, 0);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+ } else {
+ smart_str_free(&retval);
+ RETVAL_FALSE;
+ }
+}
+/* }}} */
+
/* {{{ proto string iconv(string in_charset, string out_charset, string str)
Returns str converted to the out_charset character set */
PHP_NAMED_FUNCTION(php_if_iconv)
@@ -370,8 +1624,8 @@
return;
err = php_iconv_string(in_buffer, (size_t)in_buffer_len,
- &out_buffer, &out_len, in_charset, out_charset);
- _php_iconv_show_error(err, in_charset, out_charset TSRMLS_CC);
+ &out_buffer, &out_len, out_charset, in_charset);
+ _php_iconv_show_error(err, out_charset, in_charset TSRMLS_CC);
if (out_buffer != NULL) {
RETVAL_STRINGL(out_buffer, out_len, 0);
} else {
@@ -408,8 +1662,8 @@
if (mimetype != NULL) {
php_iconv_err_t err = php_iconv_string(Z_STRVAL_P(zv_string),
Z_STRLEN_P(zv_string), &out_buffer, &out_len,
- ICONVG(internal_encoding), ICONVG(output_encoding));
- _php_iconv_show_error(err, ICONVG(internal_encoding),
ICONVG(output_encoding) TSRMLS_CC);
+ ICONVG(output_encoding), ICONVG(internal_encoding));
+ _php_iconv_show_error(err, ICONVG(output_encoding),
+ICONVG(internal_encoding) TSRMLS_CC);
if (out_buffer != NULL) {
spprintf(&content_type, 0, "Content-Type:%s; charset=%s",
mimetype, ICONVG(output_encoding));
if (content_type && sapi_add_header(content_type,
strlen(content_type), 0) != FAILURE) {
Index: php4/ext/iconv/php_iconv.h
diff -u php4/ext/iconv/php_iconv.h:1.13 php4/ext/iconv/php_iconv.h:1.14
--- php4/ext/iconv/php_iconv.h:1.13 Tue Dec 31 11:06:43 2002
+++ php4/ext/iconv/php_iconv.h Tue Dec 31 14:13:16 2002
@@ -44,6 +44,12 @@
PHP_FUNCTION(ob_iconv_handler);
PHP_FUNCTION(iconv_get_encoding);
PHP_FUNCTION(iconv_set_encoding);
+PHP_FUNCTION(iconv_strlen);
+PHP_FUNCTION(iconv_substr);
+PHP_FUNCTION(iconv_strpos);
+PHP_FUNCTION(iconv_strrpos);
+PHP_FUNCTION(iconv_mime_encode);
+PHP_FUNCTION(iconv_mime_decode);
ZEND_BEGIN_MODULE_GLOBALS(iconv)
char *input_encoding;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
