Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1u0jyg-00705k-9Z for pgsql-hackers@arkaria.postgresql.org; Fri, 04 Apr 2025 16:33:10 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1u0jyf-002HOw-0B for pgsql-hackers@arkaria.postgresql.org; Fri, 04 Apr 2025 16:33:09 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1u0jye-002HOl-Ez for pgsql-hackers@lists.postgresql.org; Fri, 04 Apr 2025 16:33:08 +0000 Received: from oss.nttdata.com ([49.212.34.109]) by makus.postgresql.org with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u0jyb-002ws7-07 for pgsql-hackers@postgresql.org; Fri, 04 Apr 2025 16:33:07 +0000 Received: from [192.168.11.5] (p1696134-ipoe.ipoe.ocn.ne.jp [118.0.93.133]) by oss.nttdata.com (Postfix) with ESMTPSA id 353D66067A; Sat, 5 Apr 2025 01:33:00 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at oss.nttdata.com Content-Type: multipart/mixed; boundary="------------yEZksGxj8nqHiNY8eURA12qo" Message-ID: <18d80eb9-1e7a-4ead-98fe-60efc988954b@oss.nttdata.com> Date: Sat, 5 Apr 2025 01:32:57 +0900 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Use XLOG_CONTROL_FILE macro everywhere? To: "Anton A. Melnikov" , Kyotaro Horiguchi Cc: daniel@yesql.se, peter@eisentraut.org, tgl@sss.pgh.pa.us, robertmhaas@gmail.com, michael@paquier.xyz, pgsql-hackers@postgresql.org References: <54B16BF2-6979-4BB0-BE39-118D32B1BC58@yesql.se> <20240903.143756.562059416508617821.horikyota.ntt@gmail.com> <20240904.170927.1051663922860738119.horikyota.ntt@gmail.com> <359568e0-cffc-4f64-b84c-eee76ba229b8@postgrespro.ru> <2883bd25-f362-41ed-8d41-b6e0aac8fa27@postgrespro.ru> Content-Language: en-US From: Fujii Masao In-Reply-To: <2883bd25-f362-41ed-8d41-b6e0aac8fa27@postgrespro.ru> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------yEZksGxj8nqHiNY8eURA12qo Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025/03/28 13:09, Anton A. Melnikov wrote: > Hi! > >> * Patch needs rebase by CFbot > > Rebased the patches onto the current master and marked them as v4. I'm not sure there's clear consensus yet on the changes in the 0001 and 0002 patches, and it might not be worth rushing them in right before the feature freeze. So for now, I reviewed and updated only the 0003 patch, since there seems to be agreement on that one. I've attached the updated version. It fixes a typo and replaces the remaining hardcoded control file name with the XLOG_CONTROL_FILE macro. How about committing the attached patch first? We can consider applying the others later if consensus is reached. Regards, -- Fujii Masao Advanced Computing Technology Center Research and Development Headquarters NTT DATA CORPORATION --------------yEZksGxj8nqHiNY8eURA12qo Content-Type: text/plain; charset=UTF-8; name="v5-0001-Use-XLOG_CONTROL_FILE-macro-consistently-for-cont.patch" Content-Disposition: attachment; filename*0="v5-0001-Use-XLOG_CONTROL_FILE-macro-consistently-for-cont.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzYzI4OTFlMDQyZmVjMmQ4MjUxOTA3NzgyYjAyZjVhY2RiZDMxYWU2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBNYXNhbyA8ZnVqaWlAcG9zdGdyZXNxbC5v cmc+CkRhdGU6IFNhdCwgNSBBcHIgMjAyNSAwMDoyMDozMiArMDkwMApTdWJqZWN0OiBbUEFU Q0ggdjVdIFVzZSBYTE9HX0NPTlRST0xfRklMRSBtYWNybyBjb25zaXN0ZW50bHkgZm9yIGNv bnRyb2wgZmlsZQogbmFtZS4KClRoZSBYTE9HX0NPTlRST0xfRklMRSBtYWNybyAoZGVmaW5l ZCBpbiBhY2Nlc3MveGxvZ19pbnRlcm5hbC5oKQpyZXByZXNlbnRzIHRoZSBjb250cm9sIGZp bGUgbmFtZS4gV2hpbGUgc29tZSBwYXJ0cyBvZiB0aGUgY29kZWJhc2UgYWxyZWFkeQp1c2Ug dGhpcyBtYWNybywgb3RoZXJzIHByZXZpb3VzbHkgaGFyZGNvZGVkIHRoZSBmaWxlIG5hbWUg YXMgYSBzdHJpbmcuCgpUaGlzIGNvbW1pdCByZXBsYWNlcyB0aG9zZSBoYXJkY29kZWQgc3Ry aW5ncyB3aXRoIHRoZSBtYWNybywKZW5zdXJpbmcgY29uc2lzdGVudCB1c2FnZSB0aHJvdWdo b3V0IHRoZSBjb2RlLiBUaGlzIG1ha2VzIGZ1dHVyZQptYWludGVuYW5jZSBlYXNpZXIgYW5k IGltcHJvdmVzIHNlYXJjaGFiaWxpdHksIGZvciBleGFtcGxlIHdoZW4KZ3JlcHBpbmcgZm9y IGNvbnRyb2wgZmlsZSB1c2FnZS4KLS0tCiBzcmMvYmFja2VuZC9iYWNrdXAvYmFzZWJhY2t1 cC5jICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1h c3Rlci5jICAgICAgICAgfCAgMyArKy0KIHNyYy9iaW4vcGdfY29tYmluZWJhY2t1cC9wZ19j b21iaW5lYmFja3VwLmMgfCAgNSArKystLQogc3JjL2Jpbi9wZ19jb250cm9sZGF0YS9wZ19j b250cm9sZGF0YS5jICAgICB8ICAyICstCiBzcmMvYmluL3BnX3Jld2luZC9maWxlbWFwLmMg ICAgICAgICAgICAgICAgIHwgIDMgKystCiBzcmMvYmluL3BnX3Jld2luZC9wZ19yZXdpbmQu YyAgICAgICAgICAgICAgIHwgIDggKysrKy0tLS0KIHNyYy9iaW4vcGdfdXBncmFkZS9jb250 cm9sZGF0YS5jICAgICAgICAgICAgfCAxMSArKysrKystLS0tLQogc3JjL2Jpbi9wZ192ZXJp ZnliYWNrdXAvYXN0cmVhbWVyX3ZlcmlmeS5jICB8ICA1ICsrKy0tCiBzcmMvYmluL3BnX3Zl cmlmeWJhY2t1cC9wZ192ZXJpZnliYWNrdXAuYyAgIHwgIDMgKystCiBzcmMvY29tbW9uL2Nv bnRyb2xkYXRhX3V0aWxzLmMgICAgICAgICAgICAgIHwgIDIgKy0KIDEwIGZpbGVzIGNoYW5n ZWQsIDI1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Ny Yy9iYWNrZW5kL2JhY2t1cC9iYXNlYmFja3VwLmMgYi9zcmMvYmFja2VuZC9iYWNrdXAvYmFz ZWJhY2t1cC5jCmluZGV4IDg5MTYzN2UzYTQ0Li5mMGY4ODgzOGRjMiAxMDA2NDQKLS0tIGEv c3JjL2JhY2tlbmQvYmFja3VwL2Jhc2ViYWNrdXAuYworKysgYi9zcmMvYmFja2VuZC9iYWNr dXAvYmFzZWJhY2t1cC5jCkBAIC0xMzQ5LDcgKzEzNDksNyBAQCBzZW5kRGlyKGJic2luayAq c2luaywgY29uc3QgY2hhciAqcGF0aCwgaW50IGJhc2VwYXRobGVuLCBib29sIHNpemVvbmx5 LAogCQlzbnByaW50ZihwYXRoYnVmLCBzaXplb2YocGF0aGJ1ZiksICIlcy8lcyIsIHBhdGgs IGRlLT5kX25hbWUpOwogCiAJCS8qIFNraXAgcGdfY29udHJvbCBoZXJlIHRvIGJhY2sgdXAg aXQgbGFzdCAqLwotCQlpZiAoc3RyY21wKHBhdGhidWYsICIuL2dsb2JhbC9wZ19jb250cm9s IikgPT0gMCkKKwkJaWYgKHN0cmNtcChwYXRoYnVmLCAiLi8iIFhMT0dfQ09OVFJPTF9GSUxF KSA9PSAwKQogCQkJY29udGludWU7CiAKIAkJaWYgKGxzdGF0KHBhdGhidWYsICZzdGF0YnVm KSAhPSAwKQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9wb3N0bWFzdGVy LmMgYi9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYwppbmRleCAzZmU0NWRl NWRhMC4uMTdmZWQ5NmZlMjAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIv cG9zdG1hc3Rlci5jCisrKyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5j CkBAIC05MCw2ICs5MCw3IEBACiAjZW5kaWYKIAogI2luY2x1ZGUgImFjY2Vzcy94bG9nLmgi CisjaW5jbHVkZSAiYWNjZXNzL3hsb2dfaW50ZXJuYWwuaCIKICNpbmNsdWRlICJhY2Nlc3Mv eGxvZ3JlY292ZXJ5LmgiCiAjaW5jbHVkZSAiY29tbW9uL2ZpbGVfcGVybS5oIgogI2luY2x1 ZGUgImNvbW1vbi9wZ19wcm5nLmgiCkBAIC0xNTE2LDcgKzE1MTcsNyBAQCBjaGVja0NvbnRy b2xGaWxlKHZvaWQpCiAJY2hhcgkJcGF0aFtNQVhQR1BBVEhdOwogCUZJTEUJICAgKmZwOwog Ci0Jc25wcmludGYocGF0aCwgc2l6ZW9mKHBhdGgpLCAiJXMvZ2xvYmFsL3BnX2NvbnRyb2wi LCBEYXRhRGlyKTsKKwlzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksICIlcy8lcyIsIERh dGFEaXIsIFhMT0dfQ09OVFJPTF9GSUxFKTsKIAogCWZwID0gQWxsb2NhdGVGaWxlKHBhdGgs IFBHX0JJTkFSWV9SKTsKIAlpZiAoZnAgPT0gTlVMTCkKZGlmZiAtLWdpdCBhL3NyYy9iaW4v cGdfY29tYmluZWJhY2t1cC9wZ19jb21iaW5lYmFja3VwLmMgYi9zcmMvYmluL3BnX2NvbWJp bmViYWNrdXAvcGdfY29tYmluZWJhY2t1cC5jCmluZGV4IGQ2MWJkZTQyZjQ5Li40ZjhiYTE1 NjMzNiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3BnX2NvbWJpbmVi YWNrdXAuYworKysgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvcGdfY29tYmluZWJhY2t1 cC5jCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5jbHVkZSA8bGludXgvZnMuaD4KICNlbmRpZgog CisjaW5jbHVkZSAiYWNjZXNzL3hsb2dfaW50ZXJuYWwuaCIKICNpbmNsdWRlICJiYWNrdXBf bGFiZWwuaCIKICNpbmNsdWRlICJjb21tb24vY2hlY2tzdW1faGVscGVyLmgiCiAjaW5jbHVk ZSAiY29tbW9uL2NvbnRyb2xkYXRhX3V0aWxzLmgiCkBAIC0zMDAsNyArMzAxLDcgQEAgbWFp bihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQl7CiAJCQljaGFyCSAgICpjb250cm9scGF0 aDsKIAotCQkJY29udHJvbHBhdGggPSBwc3ByaW50ZigiJXMvJXMiLCBwcmlvcl9iYWNrdXBf ZGlyc1tpXSwgImdsb2JhbC9wZ19jb250cm9sIik7CisJCQljb250cm9scGF0aCA9IHBzcHJp bnRmKCIlcy8lcyIsIHByaW9yX2JhY2t1cF9kaXJzW2ldLCBYTE9HX0NPTlRST0xfRklMRSk7 CiAKIAkJCXBnX2ZhdGFsKCIlczogbWFuaWZlc3Qgc3lzdGVtIGlkZW50aWZpZXIgaXMgJSIg UFJJdTY0ICIsIGJ1dCBjb250cm9sIGZpbGUgaGFzICUiIFBSSXU2NCwKIAkJCQkJIGNvbnRy b2xwYXRoLApAQCAtNjE0LDcgKzYxNSw3IEBAIGNoZWNrX2NvbnRyb2xfZmlsZXMoaW50IG5f YmFja3VwcywgY2hhciAqKmJhY2t1cF9kaXJzKQogCQlib29sCQljcmNfb2s7CiAJCWNoYXIJ ICAgKmNvbnRyb2xwYXRoOwogCi0JCWNvbnRyb2xwYXRoID0gcHNwcmludGYoIiVzLyVzIiwg YmFja3VwX2RpcnNbaV0sICJnbG9iYWwvcGdfY29udHJvbCIpOworCQljb250cm9scGF0aCA9 IHBzcHJpbnRmKCIlcy8lcyIsIGJhY2t1cF9kaXJzW2ldLCBYTE9HX0NPTlRST0xfRklMRSk7 CiAJCXBnX2xvZ19kZWJ1ZygicmVhZGluZyBcIiVzXCIiLCBjb250cm9scGF0aCk7CiAJCWNv bnRyb2xfZmlsZSA9IGdldF9jb250cm9sZmlsZV9ieV9leGFjdF9wYXRoKGNvbnRyb2xwYXRo LCAmY3JjX29rKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19jb250cm9sZGF0YS9wZ19j b250cm9sZGF0YS5jIGIvc3JjL2Jpbi9wZ19jb250cm9sZGF0YS9wZ19jb250cm9sZGF0YS5j CmluZGV4IDk5MDFhMmJhZTUxLi43YmI4MDFiYjg4NiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9w Z19jb250cm9sZGF0YS9wZ19jb250cm9sZGF0YS5jCisrKyBiL3NyYy9iaW4vcGdfY29udHJv bGRhdGEvcGdfY29udHJvbGRhdGEuYwpAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBwZ19jb250 cm9sZGF0YQogICoKLSAqIHJlYWRzIHRoZSBkYXRhIGZyb20gJFBHREFUQS9nbG9iYWwvcGdf Y29udHJvbAorICogcmVhZHMgdGhlIGRhdGEgZnJvbSB0aGUgY29udHJvbCBmaWxlIGxvY2F0 ZWQgYXQgJFBHREFUQS9YTE9HX0NPTlRST0xfRklMRS4KICAqCiAgKiBjb3B5cmlnaHQgKGMp IE9saXZlciBFbHBoaWNrIDxvbGx5QGxmaXguY28udWs+LCAyMDAxOwogICogbGljZW5zZTog QlNECmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3Jld2luZC9maWxlbWFwLmMgYi9zcmMvYmlu L3BnX3Jld2luZC9maWxlbWFwLmMKaW5kZXggYTI4ZDE2NjdkNGMuLmM5MzM4NzFjYTlmIDEw MDY0NAotLS0gYS9zcmMvYmluL3BnX3Jld2luZC9maWxlbWFwLmMKKysrIGIvc3JjL2Jpbi9w Z19yZXdpbmQvZmlsZW1hcC5jCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSA8c3lzL3N0 YXQuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KIAorI2luY2x1ZGUgImFjY2Vzcy94bG9nX2lu dGVybmFsLmgiCiAjaW5jbHVkZSAiY2F0YWxvZy9wZ190YWJsZXNwYWNlX2QuaCIKICNpbmNs dWRlICJjb21tb24vZmlsZV91dGlscy5oIgogI2luY2x1ZGUgImNvbW1vbi9oYXNoZm5fdW5z dGFibGUuaCIKQEAgLTcwNCw3ICs3MDUsNyBAQCBkZWNpZGVfZmlsZV9hY3Rpb24oZmlsZV9l bnRyeV90ICplbnRyeSkKIAkgKiBEb24ndCB0b3VjaCB0aGUgY29udHJvbCBmaWxlLiBJdCBp cyBoYW5kbGVkIHNwZWNpYWxseSwgYWZ0ZXIgY29weWluZwogCSAqIGFsbCB0aGUgb3RoZXIg ZmlsZXMuCiAJICovCi0JaWYgKHN0cmNtcChwYXRoLCAiZ2xvYmFsL3BnX2NvbnRyb2wiKSA9 PSAwKQorCWlmIChzdHJjbXAocGF0aCwgWExPR19DT05UUk9MX0ZJTEUpID09IDApCiAJCXJl dHVybiBGSUxFX0FDVElPTl9OT05FOwogCiAJLyogU2tpcCBtYWNPUyBzeXN0ZW0gZmlsZXMg Ki8KZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfcmV3aW5kL3BnX3Jld2luZC5jIGIvc3JjL2Jp bi9wZ19yZXdpbmQvcGdfcmV3aW5kLmMKaW5kZXggMmM4YjFhMDcwMDcuLjlkMTZjMWU2YjQ3 IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX3Jld2luZC9wZ19yZXdpbmQuYworKysgYi9zcmMv YmluL3BnX3Jld2luZC9wZ19yZXdpbmQuYwpAQCAtMzI4LDcgKzMyOCw3IEBAIG1haW4oaW50 IGFyZ2MsIGNoYXIgKiphcmd2KQogCSAqIG5lZWQgdG8gbWFrZSBzdXJlIGJ5IHRoZW1zZWx2 ZXMgdGhhdCB0aGUgdGFyZ2V0IGNsdXN0ZXIgaXMgaW4gYSBjbGVhbgogCSAqIHN0YXRlLgog CSAqLwotCWJ1ZmZlciA9IHNsdXJwRmlsZShkYXRhZGlyX3RhcmdldCwgImdsb2JhbC9wZ19j b250cm9sIiwgJnNpemUpOworCWJ1ZmZlciA9IHNsdXJwRmlsZShkYXRhZGlyX3RhcmdldCwg WExPR19DT05UUk9MX0ZJTEUsICZzaXplKTsKIAlkaWdlc3RDb250cm9sRmlsZSgmQ29udHJv bEZpbGVfdGFyZ2V0LCBidWZmZXIsIHNpemUpOwogCXBnX2ZyZWUoYnVmZmVyKTsKIApAQCAt MzM4LDEyICszMzgsMTIgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJewogCQll bnN1cmVDbGVhblNodXRkb3duKGFyZ3ZbMF0pOwogCi0JCWJ1ZmZlciA9IHNsdXJwRmlsZShk YXRhZGlyX3RhcmdldCwgImdsb2JhbC9wZ19jb250cm9sIiwgJnNpemUpOworCQlidWZmZXIg PSBzbHVycEZpbGUoZGF0YWRpcl90YXJnZXQsIFhMT0dfQ09OVFJPTF9GSUxFLCAmc2l6ZSk7 CiAJCWRpZ2VzdENvbnRyb2xGaWxlKCZDb250cm9sRmlsZV90YXJnZXQsIGJ1ZmZlciwgc2l6 ZSk7CiAJCXBnX2ZyZWUoYnVmZmVyKTsKIAl9CiAKLQlidWZmZXIgPSBzb3VyY2UtPmZldGNo X2ZpbGUoc291cmNlLCAiZ2xvYmFsL3BnX2NvbnRyb2wiLCAmc2l6ZSk7CisJYnVmZmVyID0g c291cmNlLT5mZXRjaF9maWxlKHNvdXJjZSwgWExPR19DT05UUk9MX0ZJTEUsICZzaXplKTsK IAlkaWdlc3RDb250cm9sRmlsZSgmQ29udHJvbEZpbGVfc291cmNlLCBidWZmZXIsIHNpemUp OwogCXBnX2ZyZWUoYnVmZmVyKTsKIApAQCAtNjM2LDcgKzYzNiw3IEBAIHBlcmZvcm1fcmV3 aW5kKGZpbGVtYXBfdCAqZmlsZW1hcCwgcmV3aW5kX3NvdXJjZSAqc291cmNlLAogCSAqIEZl dGNoIHRoZSBjb250cm9sIGZpbGUgZnJvbSB0aGUgc291cmNlIGxhc3QuIFRoaXMgZW5zdXJl cyB0aGF0IHRoZQogCSAqIG1pblJlY292ZXJ5UG9pbnQgaXMgdXAtdG8tZGF0ZS4KIAkgKi8K LQlidWZmZXIgPSBzb3VyY2UtPmZldGNoX2ZpbGUoc291cmNlLCAiZ2xvYmFsL3BnX2NvbnRy b2wiLCAmc2l6ZSk7CisJYnVmZmVyID0gc291cmNlLT5mZXRjaF9maWxlKHNvdXJjZSwgWExP R19DT05UUk9MX0ZJTEUsICZzaXplKTsKIAlkaWdlc3RDb250cm9sRmlsZSgmQ29udHJvbEZp bGVfc291cmNlX2FmdGVyLCBidWZmZXIsIHNpemUpOwogCXBnX2ZyZWUoYnVmZmVyKTsKIApk aWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ191cGdyYWRlL2NvbnRyb2xkYXRhLmMgYi9zcmMvYmlu L3BnX3VwZ3JhZGUvY29udHJvbGRhdGEuYwppbmRleCA0N2VlMjdlYzgzNS4uOGI3YzM0OWE4 NzUgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfdXBncmFkZS9jb250cm9sZGF0YS5jCisrKyBi L3NyYy9iaW4vcGdfdXBncmFkZS9jb250cm9sZGF0YS5jCkBAIC0xMiw2ICsxMiw3IEBACiAj aW5jbHVkZSA8Y3R5cGUuaD4KICNpbmNsdWRlIDxsaW1pdHMuaD4JCQkJLyogZm9yIENIQVJf TUlOICovCiAKKyNpbmNsdWRlICJhY2Nlc3MveGxvZ19pbnRlcm5hbC5oIgogI2luY2x1ZGUg ImNvbW1vbi9zdHJpbmcuaCIKICNpbmNsdWRlICJwZ191cGdyYWRlLmgiCiAKQEAgLTc1Nywx MCArNzU4LDEwIEBAIGRpc2FibGVfb2xkX2NsdXN0ZXIodHJhbnNmZXJNb2RlIHRyYW5zZmVy X21vZGUpCiAJCQkJbmV3X3BhdGhbTUFYUEdQQVRIXTsKIAogCS8qIHJlbmFtZSBwZ19jb250 cm9sIHNvIG9sZCBzZXJ2ZXIgY2Fubm90IGJlIGFjY2lkZW50YWxseSBzdGFydGVkICovCi0J cHJlcF9zdGF0dXMoIkFkZGluZyBcIi5vbGRcIiBzdWZmaXggdG8gb2xkIGdsb2JhbC9wZ19j b250cm9sIik7CisJcHJlcF9zdGF0dXMoIkFkZGluZyBcIi5vbGRcIiBzdWZmaXggdG8gb2xk ICIgWExPR19DT05UUk9MX0ZJTEUpOwogCi0Jc25wcmludGYob2xkX3BhdGgsIHNpemVvZihv bGRfcGF0aCksICIlcy9nbG9iYWwvcGdfY29udHJvbCIsIG9sZF9jbHVzdGVyLnBnZGF0YSk7 Ci0Jc25wcmludGYobmV3X3BhdGgsIHNpemVvZihuZXdfcGF0aCksICIlcy9nbG9iYWwvcGdf Y29udHJvbC5vbGQiLCBvbGRfY2x1c3Rlci5wZ2RhdGEpOworCXNucHJpbnRmKG9sZF9wYXRo LCBzaXplb2Yob2xkX3BhdGgpLCAiJXMvJXMiLCBvbGRfY2x1c3Rlci5wZ2RhdGEsIFhMT0df Q09OVFJPTF9GSUxFKTsKKwlzbnByaW50ZihuZXdfcGF0aCwgc2l6ZW9mKG5ld19wYXRoKSwg IiVzLyVzLm9sZCIsIG9sZF9jbHVzdGVyLnBnZGF0YSwgWExPR19DT05UUk9MX0ZJTEUpOwog CWlmIChwZ19tdl9maWxlKG9sZF9wYXRoLCBuZXdfcGF0aCkgIT0gMCkKIAkJcGdfZmF0YWwo ImNvdWxkIG5vdCByZW5hbWUgZmlsZSBcIiVzXCIgdG8gXCIlc1wiOiAlbSIsCiAJCQkJIG9s ZF9wYXRoLCBuZXdfcGF0aCk7CkBAIC03NjksMTAgKzc3MCwxMCBAQCBkaXNhYmxlX29sZF9j bHVzdGVyKHRyYW5zZmVyTW9kZSB0cmFuc2Zlcl9tb2RlKQogCWlmICh0cmFuc2Zlcl9tb2Rl ID09IFRSQU5TRkVSX01PREVfTElOSykKIAkJcGdfbG9nKFBHX1JFUE9SVCwgIlxuIgogCQkJ ICAgIklmIHlvdSB3YW50IHRvIHN0YXJ0IHRoZSBvbGQgY2x1c3RlciwgeW91IHdpbGwgbmVl ZCB0byByZW1vdmVcbiIKLQkJCSAgICJ0aGUgXCIub2xkXCIgc3VmZml4IGZyb20gJXMvZ2xv YmFsL3BnX2NvbnRyb2wub2xkLlxuIgorCQkJICAgInRoZSBcIi5vbGRcIiBzdWZmaXggZnJv bSAlcy8lcy5vbGQuXG4iCiAJCQkgICAiQmVjYXVzZSBcImxpbmtcIiBtb2RlIHdhcyB1c2Vk LCB0aGUgb2xkIGNsdXN0ZXIgY2Fubm90IGJlIHNhZmVseVxuIgogCQkJICAgInN0YXJ0ZWQg b25jZSB0aGUgbmV3IGNsdXN0ZXIgaGFzIGJlZW4gc3RhcnRlZC4iLAotCQkJICAgb2xkX2Ns dXN0ZXIucGdkYXRhKTsKKwkJCSAgIG9sZF9jbHVzdGVyLnBnZGF0YSwgWExPR19DT05UUk9M X0ZJTEUpOwogCWVsc2UgaWYgKHRyYW5zZmVyX21vZGUgPT0gVFJBTlNGRVJfTU9ERV9TV0FQ KQogCQlwZ19sb2coUEdfUkVQT1JULCAiXG4iCiAJCQkgICAiQmVjYXVzZSBcInN3YXBcIiBt b2RlIHdhcyB1c2VkLCB0aGUgb2xkIGNsdXN0ZXIgY2FuIG5vIGxvbmdlciBiZVxuIgpkaWZm IC0tZ2l0IGEvc3JjL2Jpbi9wZ192ZXJpZnliYWNrdXAvYXN0cmVhbWVyX3ZlcmlmeS5jIGIv c3JjL2Jpbi9wZ192ZXJpZnliYWNrdXAvYXN0cmVhbWVyX3ZlcmlmeS5jCmluZGV4IDA3OWMz OTcwNDEwLi4yNjhjNWYwZTI0NiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ192ZXJpZnliYWNr dXAvYXN0cmVhbWVyX3ZlcmlmeS5jCisrKyBiL3NyYy9iaW4vcGdfdmVyaWZ5YmFja3VwL2Fz dHJlYW1lcl92ZXJpZnkuYwpAQCAtMTQsNiArMTQsNyBAQAogCiAjaW5jbHVkZSAicG9zdGdy ZXNfZmUuaCIKIAorI2luY2x1ZGUgImFjY2Vzcy94bG9nX2ludGVybmFsLmgiCiAjaW5jbHVk ZSAiY2F0YWxvZy9wZ19jb250cm9sLmgiCiAjaW5jbHVkZSAicGdfdmVyaWZ5YmFja3VwLmgi CiAKQEAgLTIyNSw3ICsyMjYsNyBAQCBtZW1iZXJfdmVyaWZ5X2hlYWRlcihhc3RyZWFtZXIg KnN0cmVhbWVyLCBhc3RyZWFtZXJfbWVtYmVyICptZW1iZXIpCiAJCSghbXlzdHJlYW1lci0+ Y29udGV4dC0+c2tpcF9jaGVja3N1bXMgJiYgc2hvdWxkX3ZlcmlmeV9jaGVja3N1bShtKSk7 CiAJbXlzdHJlYW1lci0+dmVyaWZ5X2NvbnRyb2xfZGF0YSA9CiAJCW15c3RyZWFtZXItPmNv bnRleHQtPm1hbmlmZXN0LT52ZXJzaW9uICE9IDEgJiYKLQkJIW0tPmJhZCAmJiBzdHJjbXAo bS0+cGF0aG5hbWUsICJnbG9iYWwvcGdfY29udHJvbCIpID09IDA7CisJCSFtLT5iYWQgJiYg c3RyY21wKG0tPnBhdGhuYW1lLCBYTE9HX0NPTlRST0xfRklMRSkgPT0gMDsKIAogCS8qIElm IHdlJ3JlIGdvaW5nIHRvIHZlcmlmeSB0aGUgY2hlY2tzdW0sIGluaXRpYWwgYSBjaGVja3N1 bSBjb250ZXh0LiAqLwogCWlmIChteXN0cmVhbWVyLT52ZXJpZnlfY2hlY2tzdW0gJiYKQEAg LTM3MCw3ICszNzEsNyBAQCBtZW1iZXJfdmVyaWZ5X2NvbnRyb2xfZGF0YShhc3RyZWFtZXIg KnN0cmVhbWVyKQogCXBnX2NyYzMyYwljcmM7CiAKIAkvKiBTaG91bGQgYmUgaGVyZSBvbmx5 IGZvciBjb250cm9sIGZpbGUgKi8KLQlBc3NlcnQoc3RyY21wKG15c3RyZWFtZXItPm1maWxl LT5wYXRobmFtZSwgImdsb2JhbC9wZ19jb250cm9sIikgPT0gMCk7CisJQXNzZXJ0KHN0cmNt cChteXN0cmVhbWVyLT5tZmlsZS0+cGF0aG5hbWUsIFhMT0dfQ09OVFJPTF9GSUxFKSA9PSAw KTsKIAlBc3NlcnQobXlzdHJlYW1lci0+dmVyaWZ5X2NvbnRyb2xfZGF0YSk7CiAKIAkvKgpk aWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ192ZXJpZnliYWNrdXAvcGdfdmVyaWZ5YmFja3VwLmMg Yi9zcmMvYmluL3BnX3ZlcmlmeWJhY2t1cC9wZ192ZXJpZnliYWNrdXAuYwppbmRleCAzODM2 NjhhOGI2YS4uM2NlMjMzZjNjMjAgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfdmVyaWZ5YmFj a3VwL3BnX3ZlcmlmeWJhY2t1cC5jCisrKyBiL3NyYy9iaW4vcGdfdmVyaWZ5YmFja3VwL3Bn X3ZlcmlmeWJhY2t1cC5jCkBAIC0xOCw2ICsxOCw3IEBACiAjaW5jbHVkZSA8c3lzL3N0YXQu aD4KICNpbmNsdWRlIDx0aW1lLmg+CiAKKyNpbmNsdWRlICJhY2Nlc3MveGxvZ19pbnRlcm5h bC5oIgogI2luY2x1ZGUgImNvbW1vbi9sb2dnaW5nLmgiCiAjaW5jbHVkZSAiY29tbW9uL3Bh cnNlX21hbmlmZXN0LmgiCiAjaW5jbHVkZSAiZmVfdXRpbHMvc2ltcGxlX2xpc3QuaCIKQEAg LTczMCw3ICs3MzEsNyBAQCB2ZXJpZnlfcGxhaW5fYmFja3VwX2ZpbGUodmVyaWZpZXJfY29u dGV4dCAqY29udGV4dCwgY2hhciAqcmVscGF0aCwKIAkgKiB2ZXJzaW9uIDEuCiAJICovCiAJ aWYgKGNvbnRleHQtPm1hbmlmZXN0LT52ZXJzaW9uICE9IDEgJiYKLQkJc3RyY21wKHJlbHBh dGgsICJnbG9iYWwvcGdfY29udHJvbCIpID09IDApCisJCXN0cmNtcChyZWxwYXRoLCBYTE9H X0NPTlRST0xfRklMRSkgPT0gMCkKIAkJdmVyaWZ5X2NvbnRyb2xfZmlsZShmdWxscGF0aCwg Y29udGV4dC0+bWFuaWZlc3QtPnN5c3RlbV9pZGVudGlmaWVyKTsKIAogCS8qIFVwZGF0ZSBz dGF0aXN0aWNzIGZvciBwcm9ncmVzcyByZXBvcnQsIGlmIG5lY2Vzc2FyeSAqLwpkaWZmIC0t Z2l0IGEvc3JjL2NvbW1vbi9jb250cm9sZGF0YV91dGlscy5jIGIvc3JjL2NvbW1vbi9jb250 cm9sZGF0YV91dGlscy5jCmluZGV4IDM0ZDhhM2E0ZTMxLi5mYTM3NWRjOTEyOSAxMDA2NDQK LS0tIGEvc3JjL2NvbW1vbi9jb250cm9sZGF0YV91dGlscy5jCisrKyBiL3NyYy9jb21tb24v Y29udHJvbGRhdGFfdXRpbHMuYwpAQCAtNTMsNyArNTMsNyBAQCBnZXRfY29udHJvbGZpbGUo Y29uc3QgY2hhciAqRGF0YURpciwgYm9vbCAqY3JjX29rX3ApCiB7CiAJY2hhcgkJQ29udHJv bEZpbGVQYXRoW01BWFBHUEFUSF07CiAKLQlzbnByaW50ZihDb250cm9sRmlsZVBhdGgsIE1B WFBHUEFUSCwgIiVzL2dsb2JhbC9wZ19jb250cm9sIiwgRGF0YURpcik7CisJc25wcmludGYo Q29udHJvbEZpbGVQYXRoLCBNQVhQR1BBVEgsICIlcy8lcyIsIERhdGFEaXIsIFhMT0dfQ09O VFJPTF9GSUxFKTsKIAogCXJldHVybiBnZXRfY29udHJvbGZpbGVfYnlfZXhhY3RfcGF0aChD b250cm9sRmlsZVBhdGgsIGNyY19va19wKTsKIH0KLS0gCjIuNDguMQoK --------------yEZksGxj8nqHiNY8eURA12qo--