From owner-freebsd-gnome@FreeBSD.ORG Sun Aug 23 22:01:00 2009 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2186A106568C; Sun, 23 Aug 2009 22:01:00 +0000 (UTC) (envelope-from turutani@scphys.kyoto-u.ac.jp) Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [130.54.120.65]) by mx1.freebsd.org (Postfix) with ESMTP id 38F498FC16; Sun, 23 Aug 2009 22:00:58 +0000 (UTC) Received: from POLYMER5.scphys.kyoto-u.ac.jp (w4d164.Bas4.vectant.ne.jp [222.230.84.164]) by smtp-auth.kuins.kyoto-u.ac.jp (Postfix) with ESMTP id CF8ADA90069; Mon, 24 Aug 2009 06:33:06 +0900 (JST) Message-Id: <200908232133.AA01110@POLYMER5.scphys.kyoto-u.ac.jp> From: Tsurutani Naoki Date: Mon, 24 Aug 2009 06:33:05 +0900 To: marcus@FreeBSD.org In-Reply-To: <200908221723.n7MHNEtK030536@freefall.freebsd.org> References: <200908221723.n7MHNEtK030536@freefall.freebsd.org> MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 Content-Type: multipart/mixed; boundary="--------------------0047528584373003" Cc: gnome@FreeBSD.org Subject: Re: ports/137980: fix for textprox/libxml2 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2009 22:01:00 -0000 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--