Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jshbF-0008AV-HX for pgsql-hackers@arkaria.postgresql.org; Tue, 07 Jul 2020 07:01:06 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jshbE-00063Z-F8 for pgsql-hackers@arkaria.postgresql.org; Tue, 07 Jul 2020 07:01:04 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jshbD-00063R-Cl for pgsql-hackers@lists.postgresql.org; Tue, 07 Jul 2020 07:01:04 +0000 Received: from [64.147.123.30] (helo=wforward1-smtp.messagingengine.com) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jshb4-0007nr-9s for pgsql-hackers@postgresql.org; Tue, 07 Jul 2020 07:01:02 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id A9B02C90; Tue, 7 Jul 2020 03:00:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 07 Jul 2020 03:00:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=OUTv9j iE4TpN8Otb+I2BYelAb+zfBIrm9D9LOZz8NWY=; b=P0vxVU4EupjE5aI9jm9bOE 19gtruzIkdGWLuCePmaRszUAysxzAL+cRjMD5uRMqIO2s3Gtcvnyhm8uGWvLHmnr CTKjK2CKbxRmRzJp3jtSDOZSZ1NzpmKCATs8RfZGUN81vVXn9QeWEqONy2Cuqa8j MAElazMYB91Sag9aY+rMPsJEX4ni/EAJP2OqfOghtJK7FdhvQlEJiPm9xEL1txJV YeQJUK1bg84G9GLn53oUro2WhzrZEoboX/zTb/sTwR6J3wTxswJopX8QME2o8Cab KEv9vTjGqOcLuBIzkGsLxfWnG8O+F3OziU3YJbimiPeKvzjrrvQCc1FGmAUDMUbw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudeggdduudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepuffvfhfhohfkffgfgggjtgesmhdtreertdefjeenucfhrhhomheprfgvthgv rhcugfhishgvnhhtrhgruhhtuceophgvthgvrhdrvghishgvnhhtrhgruhhtsedvnhguqh hurggurhgrnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpedugfeuveeileeugfegledu gffhuefhhfejheefgfeludeftdeivedugfegvefgjeenucffohhmrghinhepvdhnughquh grughrrghnthdrtghomhenucfkphepleefrddvgeefrdduledurddvfeeknecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphgvthgvrhdrvghish gvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhm X-ME-Proxy: Received: from april.pezone.net (p5df3bfee.dip0.t-ipconnect.de [93.243.191.238]) by mail.messagingengine.com (Postfix) with ESMTPA id 0E12D328005A; Tue, 7 Jul 2020 03:00:39 -0400 (EDT) Subject: Re: some more pg_dump refactoring To: Fabien COELHO References: <6594334b-40fd-14f1-6bc5-877afa3feed5@2ndquadrant.com> <458c97a0-1841-88c9-eddf-a45a8ba86811@2ndquadrant.com> Cc: pgsql-hackers From: Peter Eisentraut Organization: 2ndQuadrant Message-ID: Date: Tue, 7 Jul 2020 09:00:38 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------670046D5C72B5E99A9841BE5" Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 64.147.123.30 (deferred) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------670046D5C72B5E99A9841BE5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2020-06-30 16:56, Fabien COELHO wrote: >>> Would it make sense to accumulate in the other direction, older to newer, >>> so that new attributes are added at the end of the select? >> I think that could make sense, but the current style was introduced by >> daa9fe8a5264a3f192efa5ddee8fb011ad9da365. Should we revise that? > It seems to me more logical to do it while you're at it, but you are the > one writing the patches:-) What do you think about this patch to reorganize the existing code from that old commit? -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------670046D5C72B5E99A9841BE5 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-pg_dump-Further-reorganize-getTableAttrs.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-pg_dump-Further-reorganize-getTableAttrs.patch" RnJvbSBlY2E2ZmQ4MGI2Y2E4NTBhMGY1ZTQwYzQwZDdjYjFiZTQ4YWIyZTJhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVHVlLCA3IEp1bCAyMDIwIDA4OjU4OjE2ICswMjAwClN1YmplY3Q6 IFtQQVRDSF0gcGdfZHVtcDogRnVydGhlciByZW9yZ2FuaXplIGdldFRhYmxlQXR0cnMoKQoK QWZ0ZXIgZnVydGhlciBkaXNjdXNzaW9uIGFmdGVyCmRhYTlmZThhNTI2NGEzZjE5MmVmYTVk ZGVlOGZiMDExYWQ5ZGEzNjUsIHJlb3JkZXIgdGhlIHZlcnNpb24tc3BlY2lmaWMKc2VjdGlv bnMgZnJvbSBvbGRlc3QgdG8gbmV3ZXN0LiAgQWxzbywgcmVtb3ZlIHRoZSB2YXJpYWJsZSBh c3NpZ25tZW50cwpmcm9tIFBRZm51bWJlcigpIHRvIHJlZHVjZSB2ZXJ0aWNhbCBzcGFjZS4K LS0tCiBzcmMvYmluL3BnX2R1bXAvcGdfZHVtcC5jIHwgMTQ5ICsrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygr KSwgOTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19kdW1wL3BnX2R1 bXAuYyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMKaW5kZXggYTQxYTNkYjg3Ni4uYWEw NzI1NjI3YSAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19kdW1wL3BnX2R1bXAuYworKysgYi9z cmMvYmluL3BnX2R1bXAvcGdfZHVtcC5jCkBAIC04NDMxLDM1ICs4NDMxLDE0IEBAIHZvaWQK IGdldFRhYmxlQXR0cnMoQXJjaGl2ZSAqZm91dCwgVGFibGVJbmZvICp0YmxpbmZvLCBpbnQg bnVtVGFibGVzKQogewogCUR1bXBPcHRpb25zICpkb3B0ID0gZm91dC0+ZG9wdDsKLQlpbnQJ CQlpLAotCQkJCWo7CiAJUFFFeHBCdWZmZXIgcSA9IGNyZWF0ZVBRRXhwQnVmZmVyKCk7Ci0J aW50CQkJaV9hdHRudW07Ci0JaW50CQkJaV9hdHRuYW1lOwotCWludAkJCWlfYXR0dHlwbmFt ZTsKLQlpbnQJCQlpX2F0dHR5cG1vZDsKLQlpbnQJCQlpX2F0dHN0YXR0YXJnZXQ7Ci0JaW50 CQkJaV9hdHRzdG9yYWdlOwotCWludAkJCWlfdHlwc3RvcmFnZTsKLQlpbnQJCQlpX2F0dG5v dG51bGw7Ci0JaW50CQkJaV9hdHRoYXNkZWY7Ci0JaW50CQkJaV9hdHRpZGVudGl0eTsKLQlp bnQJCQlpX2F0dGdlbmVyYXRlZDsKLQlpbnQJCQlpX2F0dGlzZHJvcHBlZDsKLQlpbnQJCQlp X2F0dGxlbjsKLQlpbnQJCQlpX2F0dGFsaWduOwotCWludAkJCWlfYXR0aXNsb2NhbDsKLQlp bnQJCQlpX2F0dG9wdGlvbnM7Ci0JaW50CQkJaV9hdHRjb2xsYXRpb247Ci0JaW50CQkJaV9h dHRmZHdvcHRpb25zOwotCWludAkJCWlfYXR0bWlzc2luZ3ZhbDsKLQlQR3Jlc3VsdCAgICpy ZXM7Ci0JaW50CQkJbnR1cHM7Ci0JYm9vbAkJaGFzZGVmYXVsdHM7CiAKLQlmb3IgKGkgPSAw OyBpIDwgbnVtVGFibGVzOyBpKyspCisJZm9yIChpbnQgaSA9IDA7IGkgPCBudW1UYWJsZXM7 IGkrKykKIAl7CiAJCVRhYmxlSW5mbyAgKnRiaW5mbyA9ICZ0YmxpbmZvW2ldOworCQlQR3Jl c3VsdCAgICpyZXM7CisJCWludAkJCW50dXBzOworCQlib29sCQloYXNkZWZhdWx0czsKIAog CQkvKiBEb24ndCBib3RoZXIgdG8gY29sbGVjdCBpbmZvIGZvciBzZXF1ZW5jZXMgKi8KIAkJ aWYgKHRiaW5mby0+cmVsa2luZCA9PSBSRUxLSU5EX1NFUVVFTkNFKQpAQCAtODQ5NywyNyAr ODQ3NiwyNyBAQCBnZXRUYWJsZUF0dHJzKEFyY2hpdmUgKmZvdXQsIFRhYmxlSW5mbyAqdGJs aW5mbywgaW50IG51bVRhYmxlcykKIAkJCQkJCQkgImEuYXR0aXNsb2NhbCxcbiIKIAkJCQkJ CQkgInBnX2NhdGFsb2cuZm9ybWF0X3R5cGUodC5vaWQsIGEuYXR0dHlwbW9kKSBBUyBhdHR0 eXBuYW1lLFxuIik7CiAKLQkJaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gMTIwMDAwKQot CQkJYXBwZW5kUFFFeHBCdWZmZXJTdHIocSwKLQkJCQkJCQkJICJhLmF0dGdlbmVyYXRlZCxc biIpOwotCQllbHNlCi0JCQlhcHBlbmRQUUV4cEJ1ZmZlclN0cihxLAotCQkJCQkJCQkgIicn IEFTIGF0dGdlbmVyYXRlZCxcbiIpOwotCi0JCWlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49 IDExMDAwMCkKKwkJaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gOTAwMDApCiAJCQlhcHBl bmRQUUV4cEJ1ZmZlclN0cihxLAotCQkJCQkJCQkgIkNBU0UgV0hFTiBhLmF0dGhhc21pc3Np bmcgQU5EIE5PVCBhLmF0dGlzZHJvcHBlZCAiCi0JCQkJCQkJCSAiVEhFTiBhLmF0dG1pc3Np bmd2YWwgRUxTRSBudWxsIEVORCBBUyBhdHRtaXNzaW5ndmFsLFxuIik7CisJCQkJCQkJCSAi YXJyYXlfdG9fc3RyaW5nKGEuYXR0b3B0aW9ucywgJywgJykgQVMgYXR0b3B0aW9ucyxcbiIp OwogCQllbHNlCiAJCQlhcHBlbmRQUUV4cEJ1ZmZlclN0cihxLAotCQkJCQkJCQkgIk5VTEwg QVMgYXR0bWlzc2luZ3ZhbCxcbiIpOworCQkJCQkJCQkgIicnIEFTIGF0dG9wdGlvbnMsXG4i KTsKIAotCQlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSAxMDAwMDApCisJCWlmIChmb3V0 LT5yZW1vdGVWZXJzaW9uID49IDkwMTAwKQorCQl7CisJCQkvKgorCQkJICogU2luY2Ugd2Ug b25seSB3YW50IHRvIGR1bXAgQ09MTEFURSBjbGF1c2VzIGZvciBhdHRyaWJ1dGVzIHdob3Nl CisJCQkgKiBjb2xsYXRpb24gaXMgZGlmZmVyZW50IGZyb20gdGhlaXIgdHlwZSdzIGRlZmF1 bHQsIHdlIHVzZSBhIENBU0UKKwkJCSAqIGhlcmUgdG8gc3VwcHJlc3MgdW5pbnRlcmVzdGlu ZyBhdHRjb2xsYXRpb25zIGNoZWFwbHkuCisJCQkgKi8KIAkJCWFwcGVuZFBRRXhwQnVmZmVy U3RyKHEsCi0JCQkJCQkJCSAiYS5hdHRpZGVudGl0eSxcbiIpOworCQkJCQkJCQkgIkNBU0Ug V0hFTiBhLmF0dGNvbGxhdGlvbiA8PiB0LnR5cGNvbGxhdGlvbiAiCisJCQkJCQkJCSAiVEhF TiBhLmF0dGNvbGxhdGlvbiBFTFNFIDAgRU5EIEFTIGF0dGNvbGxhdGlvbixcbiIpOworCQl9 CiAJCWVsc2UKIAkJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHEsCi0JCQkJCQkJCSAiJycgQVMg YXR0aWRlbnRpdHksXG4iKTsKKwkJCQkJCQkJICIwIEFTIGF0dGNvbGxhdGlvbixcbiIpOwog CiAJCWlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDkwMjAwKQogCQkJYXBwZW5kUFFFeHBC dWZmZXJTdHIocSwKQEAgLTg1MzEsMjcgKzg1MTAsMjcgQEAgZ2V0VGFibGVBdHRycyhBcmNo aXZlICpmb3V0LCBUYWJsZUluZm8gKnRibGluZm8sIGludCBudW1UYWJsZXMpCiAJCQlhcHBl bmRQUUV4cEJ1ZmZlclN0cihxLAogCQkJCQkJCQkgIicnIEFTIGF0dGZkd29wdGlvbnMsXG4i KTsKIAotCQlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA5MDEwMCkKLQkJewotCQkJLyoK LQkJCSAqIFNpbmNlIHdlIG9ubHkgd2FudCB0byBkdW1wIENPTExBVEUgY2xhdXNlcyBmb3Ig YXR0cmlidXRlcyB3aG9zZQotCQkJICogY29sbGF0aW9uIGlzIGRpZmZlcmVudCBmcm9tIHRo ZWlyIHR5cGUncyBkZWZhdWx0LCB3ZSB1c2UgYSBDQVNFCi0JCQkgKiBoZXJlIHRvIHN1cHBy ZXNzIHVuaW50ZXJlc3RpbmcgYXR0Y29sbGF0aW9ucyBjaGVhcGx5LgotCQkJICovCisJCWlm IChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDEwMDAwMCkKIAkJCWFwcGVuZFBRRXhwQnVmZmVy U3RyKHEsCi0JCQkJCQkJCSAiQ0FTRSBXSEVOIGEuYXR0Y29sbGF0aW9uIDw+IHQudHlwY29s bGF0aW9uICIKLQkJCQkJCQkJICJUSEVOIGEuYXR0Y29sbGF0aW9uIEVMU0UgMCBFTkQgQVMg YXR0Y29sbGF0aW9uLFxuIik7Ci0JCX0KKwkJCQkJCQkJICJhLmF0dGlkZW50aXR5LFxuIik7 CiAJCWVsc2UKIAkJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHEsCi0JCQkJCQkJCSAiMCBBUyBh dHRjb2xsYXRpb24sXG4iKTsKKwkJCQkJCQkJICInJyBBUyBhdHRpZGVudGl0eSxcbiIpOwog Ci0JCWlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDkwMDAwKQorCQlpZiAoZm91dC0+cmVt b3RlVmVyc2lvbiA+PSAxMTAwMDApCiAJCQlhcHBlbmRQUUV4cEJ1ZmZlclN0cihxLAotCQkJ CQkJCQkgImFycmF5X3RvX3N0cmluZyhhLmF0dG9wdGlvbnMsICcsICcpIEFTIGF0dG9wdGlv bnNcbiIpOworCQkJCQkJCQkgIkNBU0UgV0hFTiBhLmF0dGhhc21pc3NpbmcgQU5EIE5PVCBh LmF0dGlzZHJvcHBlZCAiCisJCQkJCQkJCSAiVEhFTiBhLmF0dG1pc3Npbmd2YWwgRUxTRSBu dWxsIEVORCBBUyBhdHRtaXNzaW5ndmFsLFxuIik7CiAJCWVsc2UKIAkJCWFwcGVuZFBRRXhw QnVmZmVyU3RyKHEsCi0JCQkJCQkJCSAiJycgQVMgYXR0b3B0aW9uc1xuIik7CisJCQkJCQkJ CSAiTlVMTCBBUyBhdHRtaXNzaW5ndmFsLFxuIik7CisKKwkJaWYgKGZvdXQtPnJlbW90ZVZl cnNpb24gPj0gMTIwMDAwKQorCQkJYXBwZW5kUFFFeHBCdWZmZXJTdHIocSwKKwkJCQkJCQkJ ICJhLmF0dGdlbmVyYXRlZFxuIik7CisJCWVsc2UKKwkJCWFwcGVuZFBRRXhwQnVmZmVyU3Ry KHEsCisJCQkJCQkJCSAiJycgQVMgYXR0Z2VuZXJhdGVkXG4iKTsKIAogCQkvKiBuZWVkIGxl ZnQgam9pbiBoZXJlIHRvIG5vdCBmYWlsIG9uIGRyb3BwZWQgY29sdW1ucyAuLi4gKi8KIAkJ YXBwZW5kUFFFeHBCdWZmZXIocSwKQEAgLTg1NjYsMjYgKzg1NDUsNiBAQCBnZXRUYWJsZUF0 dHJzKEFyY2hpdmUgKmZvdXQsIFRhYmxlSW5mbyAqdGJsaW5mbywgaW50IG51bVRhYmxlcykK IAogCQludHVwcyA9IFBRbnR1cGxlcyhyZXMpOwogCi0JCWlfYXR0bnVtID0gUFFmbnVtYmVy KHJlcywgImF0dG51bSIpOwotCQlpX2F0dG5hbWUgPSBQUWZudW1iZXIocmVzLCAiYXR0bmFt ZSIpOwotCQlpX2F0dHR5cG5hbWUgPSBQUWZudW1iZXIocmVzLCAiYXR0dHlwbmFtZSIpOwot CQlpX2F0dHR5cG1vZCA9IFBRZm51bWJlcihyZXMsICJhdHR0eXBtb2QiKTsKLQkJaV9hdHRz dGF0dGFyZ2V0ID0gUFFmbnVtYmVyKHJlcywgImF0dHN0YXR0YXJnZXQiKTsKLQkJaV9hdHRz dG9yYWdlID0gUFFmbnVtYmVyKHJlcywgImF0dHN0b3JhZ2UiKTsKLQkJaV90eXBzdG9yYWdl ID0gUFFmbnVtYmVyKHJlcywgInR5cHN0b3JhZ2UiKTsKLQkJaV9hdHRub3RudWxsID0gUFFm bnVtYmVyKHJlcywgImF0dG5vdG51bGwiKTsKLQkJaV9hdHRoYXNkZWYgPSBQUWZudW1iZXIo cmVzLCAiYXR0aGFzZGVmIik7Ci0JCWlfYXR0aWRlbnRpdHkgPSBQUWZudW1iZXIocmVzLCAi YXR0aWRlbnRpdHkiKTsKLQkJaV9hdHRnZW5lcmF0ZWQgPSBQUWZudW1iZXIocmVzLCAiYXR0 Z2VuZXJhdGVkIik7Ci0JCWlfYXR0aXNkcm9wcGVkID0gUFFmbnVtYmVyKHJlcywgImF0dGlz ZHJvcHBlZCIpOwotCQlpX2F0dGxlbiA9IFBRZm51bWJlcihyZXMsICJhdHRsZW4iKTsKLQkJ aV9hdHRhbGlnbiA9IFBRZm51bWJlcihyZXMsICJhdHRhbGlnbiIpOwotCQlpX2F0dGlzbG9j YWwgPSBQUWZudW1iZXIocmVzLCAiYXR0aXNsb2NhbCIpOwotCQlpX2F0dG9wdGlvbnMgPSBQ UWZudW1iZXIocmVzLCAiYXR0b3B0aW9ucyIpOwotCQlpX2F0dGNvbGxhdGlvbiA9IFBRZm51 bWJlcihyZXMsICJhdHRjb2xsYXRpb24iKTsKLQkJaV9hdHRmZHdvcHRpb25zID0gUFFmbnVt YmVyKHJlcywgImF0dGZkd29wdGlvbnMiKTsKLQkJaV9hdHRtaXNzaW5ndmFsID0gUFFmbnVt YmVyKHJlcywgImF0dG1pc3Npbmd2YWwiKTsKLQogCQl0YmluZm8tPm51bWF0dHMgPSBudHVw czsKIAkJdGJpbmZvLT5hdHRuYW1lcyA9IChjaGFyICoqKSBwZ19tYWxsb2MobnR1cHMgKiBz aXplb2YoY2hhciAqKSk7CiAJCXRiaW5mby0+YXR0dHlwbmFtZXMgPSAoY2hhciAqKikgcGdf bWFsbG9jKG50dXBzICogc2l6ZW9mKGNoYXIgKikpOwpAQCAtODYwOCwzMSArODU2NywzMSBA QCBnZXRUYWJsZUF0dHJzKEFyY2hpdmUgKmZvdXQsIFRhYmxlSW5mbyAqdGJsaW5mbywgaW50 IG51bVRhYmxlcykKIAkJdGJpbmZvLT5hdHRyZGVmcyA9IChBdHRyRGVmSW5mbyAqKikgcGdf bWFsbG9jKG50dXBzICogc2l6ZW9mKEF0dHJEZWZJbmZvICopKTsKIAkJaGFzZGVmYXVsdHMg PSBmYWxzZTsKIAotCQlmb3IgKGogPSAwOyBqIDwgbnR1cHM7IGorKykKKwkJZm9yIChpbnQg aiA9IDA7IGogPCBudHVwczsgaisrKQogCQl7Ci0JCQlpZiAoaiArIDEgIT0gYXRvaShQUWdl dHZhbHVlKHJlcywgaiwgaV9hdHRudW0pKSkKKwkJCWlmIChqICsgMSAhPSBhdG9pKFBRZ2V0 dmFsdWUocmVzLCBqLCBQUWZudW1iZXIocmVzLCAiYXR0bnVtIikpKSkKIAkJCQlmYXRhbCgi aW52YWxpZCBjb2x1bW4gbnVtYmVyaW5nIGluIHRhYmxlIFwiJXNcIiIsCiAJCQkJCSAgdGJp bmZvLT5kb2JqLm5hbWUpOwotCQkJdGJpbmZvLT5hdHRuYW1lc1tqXSA9IHBnX3N0cmR1cChQ UWdldHZhbHVlKHJlcywgaiwgaV9hdHRuYW1lKSk7Ci0JCQl0YmluZm8tPmF0dHR5cG5hbWVz W2pdID0gcGdfc3RyZHVwKFBRZ2V0dmFsdWUocmVzLCBqLCBpX2F0dHR5cG5hbWUpKTsKLQkJ CXRiaW5mby0+YXR0dHlwbW9kW2pdID0gYXRvaShQUWdldHZhbHVlKHJlcywgaiwgaV9hdHR0 eXBtb2QpKTsKLQkJCXRiaW5mby0+YXR0c3RhdHRhcmdldFtqXSA9IGF0b2koUFFnZXR2YWx1 ZShyZXMsIGosIGlfYXR0c3RhdHRhcmdldCkpOwotCQkJdGJpbmZvLT5hdHRzdG9yYWdlW2pd ID0gKihQUWdldHZhbHVlKHJlcywgaiwgaV9hdHRzdG9yYWdlKSk7Ci0JCQl0YmluZm8tPnR5 cHN0b3JhZ2Vbal0gPSAqKFBRZ2V0dmFsdWUocmVzLCBqLCBpX3R5cHN0b3JhZ2UpKTsKLQkJ CXRiaW5mby0+YXR0aWRlbnRpdHlbal0gPSAqKFBRZ2V0dmFsdWUocmVzLCBqLCBpX2F0dGlk ZW50aXR5KSk7Ci0JCQl0YmluZm8tPmF0dGdlbmVyYXRlZFtqXSA9ICooUFFnZXR2YWx1ZShy ZXMsIGosIGlfYXR0Z2VuZXJhdGVkKSk7CisJCQl0YmluZm8tPmF0dG5hbWVzW2pdID0gcGdf c3RyZHVwKFBRZ2V0dmFsdWUocmVzLCBqLCBQUWZudW1iZXIocmVzLCAiYXR0bmFtZSIpKSk7 CisJCQl0YmluZm8tPmF0dHR5cG5hbWVzW2pdID0gcGdfc3RyZHVwKFBRZ2V0dmFsdWUocmVz LCBqLCBQUWZudW1iZXIocmVzLCAiYXR0dHlwbmFtZSIpKSk7CisJCQl0YmluZm8tPmF0dHR5 cG1vZFtqXSA9IGF0b2koUFFnZXR2YWx1ZShyZXMsIGosIFBRZm51bWJlcihyZXMsICJhdHR0 eXBtb2QiKSkpOworCQkJdGJpbmZvLT5hdHRzdGF0dGFyZ2V0W2pdID0gYXRvaShQUWdldHZh bHVlKHJlcywgaiwgUFFmbnVtYmVyKHJlcywgImF0dHN0YXR0YXJnZXQiKSkpOworCQkJdGJp bmZvLT5hdHRzdG9yYWdlW2pdID0gKihQUWdldHZhbHVlKHJlcywgaiwgUFFmbnVtYmVyKHJl cywgImF0dHN0b3JhZ2UiKSkpOworCQkJdGJpbmZvLT50eXBzdG9yYWdlW2pdID0gKihQUWdl dHZhbHVlKHJlcywgaiwgUFFmbnVtYmVyKHJlcywgInR5cHN0b3JhZ2UiKSkpOworCQkJdGJp bmZvLT5hdHRpZGVudGl0eVtqXSA9ICooUFFnZXR2YWx1ZShyZXMsIGosIFBRZm51bWJlcihy ZXMsICJhdHRpZGVudGl0eSIpKSk7CisJCQl0YmluZm8tPmF0dGdlbmVyYXRlZFtqXSA9ICoo UFFnZXR2YWx1ZShyZXMsIGosIFBRZm51bWJlcihyZXMsICJhdHRnZW5lcmF0ZWQiKSkpOwog CQkJdGJpbmZvLT5uZWVkc19vdmVycmlkZSA9IHRiaW5mby0+bmVlZHNfb3ZlcnJpZGUgfHwg KHRiaW5mby0+YXR0aWRlbnRpdHlbal0gPT0gQVRUUklCVVRFX0lERU5USVRZX0FMV0FZUyk7 Ci0JCQl0YmluZm8tPmF0dGlzZHJvcHBlZFtqXSA9IChQUWdldHZhbHVlKHJlcywgaiwgaV9h dHRpc2Ryb3BwZWQpWzBdID09ICd0Jyk7Ci0JCQl0YmluZm8tPmF0dGxlbltqXSA9IGF0b2ko UFFnZXR2YWx1ZShyZXMsIGosIGlfYXR0bGVuKSk7Ci0JCQl0YmluZm8tPmF0dGFsaWduW2pd ID0gKihQUWdldHZhbHVlKHJlcywgaiwgaV9hdHRhbGlnbikpOwotCQkJdGJpbmZvLT5hdHRp c2xvY2FsW2pdID0gKFBRZ2V0dmFsdWUocmVzLCBqLCBpX2F0dGlzbG9jYWwpWzBdID09ICd0 Jyk7Ci0JCQl0YmluZm8tPm5vdG51bGxbal0gPSAoUFFnZXR2YWx1ZShyZXMsIGosIGlfYXR0 bm90bnVsbClbMF0gPT0gJ3QnKTsKLQkJCXRiaW5mby0+YXR0b3B0aW9uc1tqXSA9IHBnX3N0 cmR1cChQUWdldHZhbHVlKHJlcywgaiwgaV9hdHRvcHRpb25zKSk7Ci0JCQl0YmluZm8tPmF0 dGNvbGxhdGlvbltqXSA9IGF0b29pZChQUWdldHZhbHVlKHJlcywgaiwgaV9hdHRjb2xsYXRp b24pKTsKLQkJCXRiaW5mby0+YXR0ZmR3b3B0aW9uc1tqXSA9IHBnX3N0cmR1cChQUWdldHZh bHVlKHJlcywgaiwgaV9hdHRmZHdvcHRpb25zKSk7Ci0JCQl0YmluZm8tPmF0dG1pc3Npbmd2 YWxbal0gPSBwZ19zdHJkdXAoUFFnZXR2YWx1ZShyZXMsIGosIGlfYXR0bWlzc2luZ3ZhbCkp OworCQkJdGJpbmZvLT5hdHRpc2Ryb3BwZWRbal0gPSAoUFFnZXR2YWx1ZShyZXMsIGosIFBR Zm51bWJlcihyZXMsICJhdHRpc2Ryb3BwZWQiKSlbMF0gPT0gJ3QnKTsKKwkJCXRiaW5mby0+ YXR0bGVuW2pdID0gYXRvaShQUWdldHZhbHVlKHJlcywgaiwgUFFmbnVtYmVyKHJlcywgImF0 dGxlbiIpKSk7CisJCQl0YmluZm8tPmF0dGFsaWduW2pdID0gKihQUWdldHZhbHVlKHJlcywg aiwgUFFmbnVtYmVyKHJlcywgImF0dGFsaWduIikpKTsKKwkJCXRiaW5mby0+YXR0aXNsb2Nh bFtqXSA9IChQUWdldHZhbHVlKHJlcywgaiwgUFFmbnVtYmVyKHJlcywgImF0dGlzbG9jYWwi KSlbMF0gPT0gJ3QnKTsKKwkJCXRiaW5mby0+bm90bnVsbFtqXSA9IChQUWdldHZhbHVlKHJl cywgaiwgUFFmbnVtYmVyKHJlcywgImF0dG5vdG51bGwiKSlbMF0gPT0gJ3QnKTsKKwkJCXRi aW5mby0+YXR0b3B0aW9uc1tqXSA9IHBnX3N0cmR1cChQUWdldHZhbHVlKHJlcywgaiwgUFFm bnVtYmVyKHJlcywgImF0dG9wdGlvbnMiKSkpOworCQkJdGJpbmZvLT5hdHRjb2xsYXRpb25b al0gPSBhdG9vaWQoUFFnZXR2YWx1ZShyZXMsIGosIFBRZm51bWJlcihyZXMsICJhdHRjb2xs YXRpb24iKSkpOworCQkJdGJpbmZvLT5hdHRmZHdvcHRpb25zW2pdID0gcGdfc3RyZHVwKFBR Z2V0dmFsdWUocmVzLCBqLCBQUWZudW1iZXIocmVzLCAiYXR0ZmR3b3B0aW9ucyIpKSk7CisJ CQl0YmluZm8tPmF0dG1pc3Npbmd2YWxbal0gPSBwZ19zdHJkdXAoUFFnZXR2YWx1ZShyZXMs IGosIFBRZm51bWJlcihyZXMsICJhdHRtaXNzaW5ndmFsIikpKTsKIAkJCXRiaW5mby0+YXR0 cmRlZnNbal0gPSBOVUxMOyAvKiBmaXggYmVsb3cgKi8KLQkJCWlmIChQUWdldHZhbHVlKHJl cywgaiwgaV9hdHRoYXNkZWYpWzBdID09ICd0JykKKwkJCWlmIChQUWdldHZhbHVlKHJlcywg aiwgUFFmbnVtYmVyKHJlcywgImF0dGhhc2RlZiIpKVswXSA9PSAndCcpCiAJCQkJaGFzZGVm YXVsdHMgPSB0cnVlOwogCQkJLyogdGhlc2UgZmxhZ3Mgd2lsbCBiZSBzZXQgaW4gZmxhZ0lu aEF0dHJzKCkgKi8KIAkJCXRiaW5mby0+aW5oTm90TnVsbFtqXSA9IGZhbHNlOwpAQCAtODY2 Myw3ICs4NjIyLDcgQEAgZ2V0VGFibGVBdHRycyhBcmNoaXZlICpmb3V0LCBUYWJsZUluZm8g KnRibGluZm8sIGludCBudW1UYWJsZXMpCiAJCQludW1EZWZhdWx0cyA9IFBRbnR1cGxlcyhy ZXMpOwogCQkJYXR0cmRlZnMgPSAoQXR0ckRlZkluZm8gKikgcGdfbWFsbG9jKG51bURlZmF1 bHRzICogc2l6ZW9mKEF0dHJEZWZJbmZvKSk7CiAKLQkJCWZvciAoaiA9IDA7IGogPCBudW1E ZWZhdWx0czsgaisrKQorCQkJZm9yIChpbnQgaiA9IDA7IGogPCBudW1EZWZhdWx0czsgaisr KQogCQkJewogCQkJCWludAkJCWFkbnVtOwogCkBAIC04Nzk1LDcgKzg3NTQsNyBAQCBnZXRU YWJsZUF0dHJzKEFyY2hpdmUgKmZvdXQsIFRhYmxlSW5mbyAqdGJsaW5mbywgaW50IG51bVRh YmxlcykKIAkJCWNvbnN0cnMgPSAoQ29uc3RyYWludEluZm8gKikgcGdfbWFsbG9jKG51bUNv bnN0cnMgKiBzaXplb2YoQ29uc3RyYWludEluZm8pKTsKIAkJCXRiaW5mby0+Y2hlY2tleHBy cyA9IGNvbnN0cnM7CiAKLQkJCWZvciAoaiA9IDA7IGogPCBudW1Db25zdHJzOyBqKyspCisJ CQlmb3IgKGludCBqID0gMDsgaiA8IG51bUNvbnN0cnM7IGorKykKIAkJCXsKIAkJCQlib29s CQl2YWxpZGF0ZWQgPSBQUWdldHZhbHVlKHJlcywgaiwgNSlbMF0gPT0gJ3QnOwogCi0tIAoy LjI3LjAKCg== --------------670046D5C72B5E99A9841BE5--