Date: Mon, 24 Aug 2009 06:33:05 +0900 From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: marcus@FreeBSD.org Cc: gnome@FreeBSD.org Subject: Re: ports/137980: fix for textprox/libxml2 Message-ID: <200908232133.AA01110@POLYMER5.scphys.kyoto-u.ac.jp> In-Reply-To: <200908221723.n7MHNEtK030536@freefall.freebsd.org> References: <200908221723.n7MHNEtK030536@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is multipart message. ----------------------0047528584373003 Content-Type: text/plain; charset=us-ascii I resend the patch: ----------------------0047528584373003 Content-Type: application/octet-stream; name="patch-parser.c" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-parser.c" LS0tIHBhcnNlci5jLm9yaWcKKysrIHBhcnNlci5jCkBAIC01MzA2LDcgKzUzMDYsOCBAQAog CWlmIChuYW1lID09IE5VTEwpIHsKIAkgICAgeG1sRmF0YWxFcnJNc2coY3R4dCwgWE1MX0VS Ul9OQU1FX1JFUVVJUkVELAogCQkJICAgIk5hbWUgZXhwZWN0ZWQgaW4gTk9UQVRJT04gZGVj bGFyYXRpb25cbiIpOwotCSAgICByZXR1cm4ocmV0KTsKKwkJeG1sRnJlZUVudW1lcmF0aW9u KHJldCk7CisJCXJldHVybihOVUxMKTsKIAl9CiAJdG1wID0gcmV0OwogCXdoaWxlICh0bXAg IT0gTlVMTCkgewpAQCAtNTMyMiw3ICs1MzIzLDEwIEBACiAJfQogCWlmICh0bXAgPT0gTlVM TCkgewogCSAgICBjdXIgPSB4bWxDcmVhdGVFbnVtZXJhdGlvbihuYW1lKTsKLQkgICAgaWYg KGN1ciA9PSBOVUxMKSByZXR1cm4ocmV0KTsKKwkgICAgaWYgKGN1ciA9PSBOVUxMKSB7CisJ CQl4bWxGcmVlRW51bWVyYXRpb24ocmV0KTsKKwkJCXJldHVybihOVUxMKTsKKwkJfQogCSAg ICBpZiAobGFzdCA9PSBOVUxMKSByZXQgPSBsYXN0ID0gY3VyOwogCSAgICBlbHNlIHsKIAkJ bGFzdC0+bmV4dCA9IGN1cjsKQEAgLTUzMzQsOCArNTMzOCw4IEBACiAgICAgaWYgKFJBVyAh PSAnKScpIHsKIAl4bWxGYXRhbEVycihjdHh0LCBYTUxfRVJSX05PVEFUSU9OX05PVF9GSU5J U0hFRCwgTlVMTCk7CiAJaWYgKChsYXN0ICE9IE5VTEwpICYmIChsYXN0ICE9IHJldCkpCi0J ICAgIHhtbEZyZWVFbnVtZXJhdGlvbihsYXN0KTsKLQlyZXR1cm4ocmV0KTsKKwkgICB4bWxG cmVlRW51bWVyYXRpb24ocmV0KTsKKwlyZXR1cm4oTlVMTCk7CiAgICAgfQogICAgIE5FWFQ7 CiAgICAgcmV0dXJuKHJldCk7CkBAIC01MzkwLDcgKzUzOTQsMTAgQEAKIAkgICAgY3VyID0g eG1sQ3JlYXRlRW51bWVyYXRpb24obmFtZSk7CiAJICAgIGlmICgheG1sRGljdE93bnMoY3R4 dC0+ZGljdCwgbmFtZSkpCiAJCXhtbEZyZWUobmFtZSk7Ci0JICAgIGlmIChjdXIgPT0gTlVM TCkgcmV0dXJuKHJldCk7CisJICAgIGlmIChjdXIgPT0gTlVMTCl7CisJCQl4bWxGcmVlRW51 bWVyYXRpb24ocmV0KTsKKwkJCXJldHVybihOVUxMKTsKKwkJfQogCSAgICBpZiAobGFzdCA9 PSBOVUxMKSByZXQgPSBsYXN0ID0gY3VyOwogCSAgICBlbHNlIHsKIAkJbGFzdC0+bmV4dCA9 IGN1cjsKQEAgLTU3OTQsNiArNTgwMSwxMSBAQAogICAgIGNvbnN0IHhtbENoYXIgKmVsZW07 CiAgICAgeG1sQ2hhciB0eXBlID0gMDsKIAorCWlmIChjdHh0LT5kZXB0aCA+IDEyOCkgewor CQl4bWxGYXRhbEVyck1zZ0ludChjdHh0LCBYTUxfRVJSX0VMRU1DT05URU5UX05PVF9GSU5J U0hFRCwgInhtbFBhcnNlRWxlbWVudENoaWxkcmVuQ29udGVudERlY2wgOiBkZXB0aCAlZCB0 b28gZGVlcFxuIiwgY3R4dC0+ZGVwdGgpOworCQlyZXR1cm4oTlVMTCk7CisJfQorCiAgICAg U0tJUF9CTEFOS1M7CiAgICAgR1JPVzsKICAgICBpZiAoUkFXID09ICcoJykgewpAQCAtNTgw Miw3ICs1ODE0LDkgQEAKICAgICAgICAgLyogUmVjdXJzZSBvbiBmaXJzdCBjaGlsZCAqLwog CU5FWFQ7CiAJU0tJUF9CTEFOS1M7CisJY3R4dC0+ZGVwdGgrKzsKICAgICAgICAgY3VyID0g cmV0ID0geG1sUGFyc2VFbGVtZW50Q2hpbGRyZW5Db250ZW50RGVjbChjdHh0LCBpbnB1dGlk KTsKKwkJY3R4dC0+ZGVwdGgtLTsKIAlTS0lQX0JMQU5LUzsKIAlHUk9XOwogICAgIH0gZWxz ZSB7CkBAIC01OTM0LDcgKzU5NDgsOSBAQAogCSAgICAvKiBSZWN1cnNlIG9uIHNlY29uZCBj aGlsZCAqLwogCSAgICBORVhUOwogCSAgICBTS0lQX0JMQU5LUzsKKwkJY3R4dC0+ZGVwdGgr KzsKIAkgICAgbGFzdCA9IHhtbFBhcnNlRWxlbWVudENoaWxkcmVuQ29udGVudERlY2woY3R4 dCwgaW5wdXRpZCk7CisJCWN0eHQtPmRlcHRoLS07CiAJICAgIFNLSVBfQkxBTktTOwogCX0g ZWxzZSB7CiAJICAgIGVsZW0gPSB4bWxQYXJzZU5hbWUoY3R4dCk7Cg== ----------------------0047528584373003--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908232133.AA01110>