Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:1510 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 16035 invoked from network); 14 May 2003 00:38:57 -0000 Received: from unknown (HELO vckyb2.nw.wakwak.com) (211.9.230.145) by pb1.pair.com with SMTP; 14 May 2003 00:38:57 -0000 Received: from at.wakwak.com (at.wakwak.com [211.9.230.135:25]) by vckyb2.nw.wakwak.com (Postfix) with ESMTP id 7C9124006B; Wed, 14 May 2003 09:38:56 +0900 (JST) Received: from at.wakwak.com (z13.61-115-65.ppp.wakwak.ne.jp [61.115.65.13]) by at.wakwak.com (8.12.9/8.12.9/2003-03-31) with SMTP id h4E0cuH5088574; Wed, 14 May 2003 09:38:56 +0900 (JST) (envelope-from moriyoshi@at.wakwak.com) Date: Wed, 14 May 2003 09:41:53 +0900 X-Mailer: EdMax Ver2.85.3F MIME-Version: 1.0 To: Masaki Fujimoto Cc: php-internal Message-ID: <20030514094153xOWnnU@at.wakwak.com> Content-Type: multipart/mixed; boundary="------------Boundary_u3c,L" Subject: [PATCH] zend-multibyte resurrection From: moriyoshi@at.wakwak.com (Moriyoshi Koizumi) --------------Boundary_u3c,L Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hi, Attached is the patch that addresses some incompatibilities of the current zend multibyte code and the brand-new fd lexer code. Could you apply this one please? Thanks, Moriyoshi --------------Boundary_u3c,L Content-Type: text/plain; name="zend-multibyte-new-stdio-patch.diff.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="zend-multibyte-new-stdio-patch.diff.txt" SW5kZXg6IFplbmQvemVuZF9sYW5ndWFnZV9zY2FubmVyLmwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL3JlcG9zaXRvcnkvWmVuZC96ZW5kX2xhbmd1YWdlX3NjYW5uZXIubCx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS41NC4yLjE0CmRpZmYgLXUgLXIxLjU0LjIuMTQgemVuZF9sYW5n dWFnZV9zY2FubmVyLmwKLS0tIFplbmQvemVuZF9sYW5ndWFnZV9zY2FubmVyLmwJMTMgTWF5 IDIwMDMgMjM6NTg6MTkgLTAwMDAJMS41NC4yLjE0CisrKyBaZW5kL3plbmRfbGFuZ3VhZ2Vf c2Nhbm5lci5sCTE0IE1heSAyMDAzIDAwOjIzOjIyIC0wMDAwCkBAIC02NjksMjcgKzY2OSw0 MSBAQAogCVNDTkcoY29kZSkgPSBOVUxMOwogCVNDTkcoY29kZV9zaXplKSA9IDA7CiAKLQlk byB7Ci0JCW4gPSBmcmVhZChidWYsIDEsIDgxOTIsIFNDTkcoeXlfaW4pKTsKLQkJaWYgKG4p IHsKLQkJCVNDTkcoY29kZV9zaXplKSArPSBuOwotCQkJaWYgKFNDTkcoY29kZSkpIHsKLQkJ CQlTQ05HKGNvZGUpID0gKGNoYXIqKWVyZWFsbG9jKFNDTkcoY29kZSksIFNDTkcoY29kZV9z aXplKSsxKTsKLQkJCQlpZiAoIVNDTkcoY29kZSkpIHsKLQkJCQkJcmV0dXJuIC0xOwotCQkJ CX0KLQkJCX0gZWxzZSB7Ci0JCQkJU0NORyhjb2RlKSA9IChjaGFyKillbWFsbG9jKFNDTkco Y29kZV9zaXplKSsxKTsKLQkJCQlpZiAoIVNDTkcoY29kZSkpIHsKLQkJCQkJcmV0dXJuIC0x OwotCQkJCX0KKwlmb3IgKDs7KSB7CisJCXN3aXRjaCAoU0NORyh5eV9pbiktPnR5cGUpIHsK KwkJCWNhc2UgWkVORF9IQU5ETEVfRkQ6CisJCQkJbiA9IHJlYWQoU0NORyh5eV9pbiktPmhh bmRsZS5mZCwgYnVmLCBzaXplb2YoYnVmKSk7CisJCQkJYnJlYWs7CisJCQljYXNlIFpFTkRf SEFORExFX0ZQOgorCQkJCW4gPSBmcmVhZChidWYsIHNpemVvZihidWZbMF0pLCBzaXplb2Yo YnVmKSAvIHNpemVvZihidWZbMF0pLCBTQ05HKHl5X2luKS0+aGFuZGxlLmZwKTsKKwkJCQli cmVhazsKKwkJCWNhc2UgWkVORF9IQU5ETEVfU09DS0VUX0ZEOgorCQkJCW4gPQlyZWN2KFND TkcoeXlfaW4pLT5oYW5kbGUuZmQsIGJ1Ziwgc2l6ZW9mKGJ1ZiksIDApOworCQl9CisKKwkJ aWYgKG4gPD0gMCkgeworCQkJYnJlYWs7CisJCX0KKworCQlTQ05HKGNvZGVfc2l6ZSkgKz0g bjsKKwkJaWYgKFNDTkcoY29kZSkpIHsKKwkJCVNDTkcoY29kZSkgPSAoY2hhciopZXJlYWxs b2MoU0NORyhjb2RlKSwgU0NORyhjb2RlX3NpemUpKzEpOworCQkJaWYgKCFTQ05HKGNvZGUp KSB7CisJCQkJcmV0dXJuIC0xOworCQkJfQorCQl9IGVsc2UgeworCQkJU0NORyhjb2RlKSA9 IChjaGFyKillbWFsbG9jKFNDTkcoY29kZV9zaXplKSsxKTsKKwkJCWlmICghU0NORyhjb2Rl KSkgeworCQkJCXJldHVybiAtMTsKIAkJCX0KLQkJCW1lbWNweShTQ05HKGNvZGUpK1NDTkco Y29kZV9zaXplKS1uLCBidWYsIG4pOwogCQl9Ci0JfSB3aGlsZShuKTsKLQlpZiAoZmVycm9y KFNDTkcoeXlfaW4pKSkgeworCQltZW1jcHkoU0NORyhjb2RlKStTQ05HKGNvZGVfc2l6ZSkt biwgYnVmLCBuKTsKKwl9CisKKwlpZiAobiA8IDApIHsKIAkJcmV0dXJuIC0xOwogCX0KKwog CWlmICghU0NORyhjb2RlKSkgewogCQlTQ05HKGNvZGUpID0gZW1hbGxvYyhTQ05HKGNvZGVf c2l6ZSkrMSk7CiAJfQp= --------------Boundary_u3c,L--