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 1ogkoD-0007oK-0v for pgsql-hackers@arkaria.postgresql.org; Fri, 07 Oct 2022 10:42:25 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1ogknD-0000p4-8L for pgsql-hackers@arkaria.postgresql.org; Fri, 07 Oct 2022 10:41:23 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ogknC-0000ov-ND for pgsql-hackers@lists.postgresql.org; Fri, 07 Oct 2022 10:41:22 +0000 Received: from oss.nttdata.com ([49.212.34.109]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ogkn9-0004W0-Lw for pgsql-hackers@lists.postgresql.org; Fri, 07 Oct 2022 10:41:21 +0000 Received: from oss.nttdata.com (localhost [127.0.0.1]) by oss.nttdata.com (Postfix) with ESMTPA id 474446053A; Fri, 7 Oct 2022 19:41:16 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.7 at oss.nttdata.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_45c2f97471863dd511878e1f36223f9e" Content-Transfer-Encoding: 7bit Date: Fri, 07 Oct 2022 19:41:16 +0900 From: bt22nakamorit To: Fujii Masao Cc: Kyotaro Horiguchi , pgsql-hackers@lists.postgresql.org Subject: Re: Make ON_ERROR_STOP stop on shell script failure In-Reply-To: <3f489f1f-3f91-8a98-4cf3-bad7ff037dc2@oss.nttdata.com> References: <20220916.173035.322733707258561235.horikyota.ntt@gmail.com> <4c61d434cb72b2237b3279797b2a387f@oss.nttdata.com> <8a022f2c8de93ea79116f0b7eb42248a@oss.nttdata.com> <3f489f1f-3f91-8a98-4cf3-bad7ff037dc2@oss.nttdata.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <1de37597cb5050b6d3d76def2826dcd4@oss.nttdata.com> X-Sender: bt22nakamorit@oss.nttdata.com List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_45c2f97471863dd511878e1f36223f9e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed 2022-10-07 17:16 Fujii Masao wrote: > The patch failed to be applied into the master cleanly. Could you > rebase it? > > patching file src/bin/psql/common.c > Hunk #1 succeeded at 94 (offset 4 lines). > Hunk #2 succeeded at 104 (offset 4 lines). > Hunk #3 succeeded at 133 (offset 4 lines). > Hunk #4 succeeded at 1869 with fuzz 1 (offset 1162 lines). > Hunk #5 FAILED at 2624. > 1 out of 5 hunks FAILED -- saving rejects to file > src/bin/psql/common.c.rej Thank you for checking. I edited the patch so that it would apply to the latest master branch. Please mention if there are any other problems. Best, Tatsuhiro Nakamori --=_45c2f97471863dd511878e1f36223f9e Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=stop_error3.patch Content-Disposition: attachment; filename=stop_error3.patch; size=9653 ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvcHNxbC1yZWYuc2dtbCBiL2RvYy9zcmMvc2dt bC9yZWYvcHNxbC1yZWYuc2dtbAppbmRleCA5NDk0ZjI4MDYzLi44MmZlYmYwYWNlIDEwMDY0NAot LS0gYS9kb2Mvc3JjL3NnbWwvcmVmL3BzcWwtcmVmLnNnbWwKKysrIGIvZG9jL3NyYy9zZ21sL3Jl Zi9wc3FsLXJlZi5zZ21sCkBAIC00MTQzLDcgKzQxNDMsMTIgQEAgYmFyCiAgICAgICAgIDxwYXJh PgogICAgICAgICBCeSBkZWZhdWx0LCBjb21tYW5kIHByb2Nlc3NpbmcgY29udGludWVzIGFmdGVy IGFuIGVycm9yLiAgV2hlbiB0aGlzCiAgICAgICAgIHZhcmlhYmxlIGlzIHNldCB0byA8bGl0ZXJh bD5vbjwvbGl0ZXJhbD4sIHByb2Nlc3Npbmcgd2lsbCBpbnN0ZWFkIHN0b3AKLSAgICAgICAgaW1t ZWRpYXRlbHkuICBJbiBpbnRlcmFjdGl2ZSBtb2RlLAorICAgICAgICBpbW1lZGlhdGVseSB1cG9u IGFuIGVycm9yIGluIFNRTCBxdWVyeS4gV2hlbiB0aGlzIHZhcmlhYmxlIGlzIHNldCB0bworICAg ICAgICA8bGl0ZXJhbD5zaGVsbDwvbGl0ZXJhbD4sIGEgbm9uemVybyBleGl0IHN0YXR1cyBvZiBh IHNoZWxsIGNvbW1hbmQsCisgICAgICAgIHdoaWNoIGluZGljYXRlcyBmYWlsdXJlLCBpcyBpbnRl cnByZXRlZCBhcyBhbiBlcnJvciB0aGF0IHN0b3BzIHRoZSBwcm9jZXNzaW5nLgorICAgICAgICBX aGVuIHRoaXMgdmFyaWFibGUgaXMgc2V0IHRvIDxsaXRlcmFsPmFsbDwvbGl0ZXJhbD4sIGVycm9y cyBmcm9tIGJvdGgKKyAgICAgICAgU1FMIHF1ZXJpZXMgYW5kIHNoZWxsIGNvbW1hbmRzIGNhbiBz dG9wIHRoZSBwcm9jZXNzaW5nLgorICAgICAgICBJbiBpbnRlcmFjdGl2ZSBtb2RlLAogICAgICAg ICA8YXBwbGljYXRpb24+cHNxbDwvYXBwbGljYXRpb24+IHdpbGwgcmV0dXJuIHRvIHRoZSBjb21t YW5kIHByb21wdDsKICAgICAgICAgb3RoZXJ3aXNlLCA8YXBwbGljYXRpb24+cHNxbDwvYXBwbGlj YXRpb24+IHdpbGwgZXhpdCwgcmV0dXJuaW5nCiAgICAgICAgIGVycm9yIGNvZGUgMyB0byBkaXN0 aW5ndWlzaCB0aGlzIGNhc2UgZnJvbSBmYXRhbCBlcnJvcgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9w c3FsL2NvbW1hbmQuYyBiL3NyYy9iaW4vcHNxbC9jb21tYW5kLmMKaW5kZXggYWI2MTNkZDQ5ZS4u Y2M3Y2EyN2UzYSAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wc3FsL2NvbW1hbmQuYworKysgYi9zcmMv YmluL3BzcWwvY29tbWFuZC5jCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiZGVzY3JpYmUu aCIKICNpbmNsdWRlICJmZV91dGlscy9jYW5jZWwuaCIKICNpbmNsdWRlICJmZV91dGlscy9wcmlu dC5oIgorI2luY2x1ZGUgImZlX3V0aWxzL3BzcWxzY2FuX2ludC5oIgogI2luY2x1ZGUgImZlX3V0 aWxzL3N0cmluZ191dGlscy5oIgogI2luY2x1ZGUgImhlbHAuaCIKICNpbmNsdWRlICJpbnB1dC5o IgpAQCAtMjM1NSw5ICsyMzU2LDEzIEBAIGV4ZWNfY29tbWFuZF9zZXQoUHNxbFNjYW5TdGF0ZSBz Y2FuX3N0YXRlLCBib29sIGFjdGl2ZV9icmFuY2gpCiAJCQkgKi8KIAkJCWNoYXIJICAgKm5ld3Zh bDsKIAkJCWNoYXIJICAgKm9wdDsKKwkJCVBRRXhwQnVmZmVyIG91dHB1dF9idWYgPSBzY2FuX3N0 YXRlLT5vdXRwdXRfYnVmOwogCiAJCQlvcHQgPSBwc3FsX3NjYW5fc2xhc2hfb3B0aW9uKHNjYW5f c3RhdGUsCiAJCQkJCQkJCQkJIE9UX05PUk1BTCwgTlVMTCwgZmFsc2UpOworCQkJaWYgKG91dHB1 dF9idWYtPmxlbiA+PSBvdXRwdXRfYnVmLT5tYXhsZW4KKwkJCQkmJiAocHNldC5vbl9lcnJvcl9z dG9wID09IFBTUUxfRVJST1JfU1RPUF9TSEVMTCB8fCBwc2V0Lm9uX2Vycm9yX3N0b3AgPT0gUFNR TF9FUlJPUl9TVE9QX0FMTCkpCisJCQkJc3VjY2VzcyA9IGZhbHNlOwogCQkJbmV3dmFsID0gcGdf c3RyZHVwKG9wdCA/IG9wdCA6ICIiKTsKIAkJCWZyZWUob3B0KTsKIApAQCAtMjY5Myw4ICsyNjk4 LDI1IEBAIGV4ZWNfY29tbWFuZF93cml0ZShQc3FsU2NhblN0YXRlIHNjYW5fc3RhdGUsIGJvb2wg YWN0aXZlX2JyYW5jaCwKIAkJCWVsc2UgaWYgKHByZXZpb3VzX2J1ZiAmJiBwcmV2aW91c19idWYt PmxlbiA+IDApCiAJCQkJZnByaW50ZihmZCwgIiVzXG4iLCBwcmV2aW91c19idWYtPmRhdGEpOwog Ci0JCQlpZiAoaXNfcGlwZSkKKwkJCWlmIChpc19waXBlKSB7CiAJCQkJcmVzdWx0ID0gcGNsb3Nl KGZkKTsKKworCQkJCWlmIChyZXN1bHQgIT0gMCkKKwkJCQl7CisJCQkJCWlmIChyZXN1bHQgPCAw KQorCQkJCQkJcGdfbG9nX2Vycm9yKCJjb3VsZCBub3QgY2xvc2UgcGlwZSB0byBleHRlcm5hbCBj b21tYW5kOiAlbSIpOworCQkJCQllbHNlCisJCQkJCXsKKwkJCQkJCWNoYXIgKnJlYXNvbiA9IHdh aXRfcmVzdWx0X3RvX3N0cihyZXN1bHQpOworCisJCQkJCQlwZ19sb2dfZXJyb3IoIiVzOiAlcyIs IGZuYW1lICsgMSwKKwkJCQkJCQkJCXJlYXNvbiA/IHJlYXNvbiA6ICIiKTsKKwkJCQkJCWZyZWUo cmVhc29uKTsKKwkJCQkJfQorCQkJCX0KKwkJCQlpZiAocHNldC5vbl9lcnJvcl9zdG9wID09IFBT UUxfRVJST1JfU1RPUF9TSEVMTCB8fCBwc2V0Lm9uX2Vycm9yX3N0b3AgPT0gUFNRTF9FUlJPUl9T VE9QX0FMTCkKKwkJCQkJc3RhdHVzID0gUFNRTF9DTURfRVJST1I7CisJCQl9CiAJCQllbHNlCiAJ CQkJcmVzdWx0ID0gZmNsb3NlKGZkKTsKIApAQCAtNDk4NCwxMCArNTAwNiwxOSBAQCBkb19zaGVs bChjb25zdCBjaGFyICpjb21tYW5kKQogCWVsc2UKIAkJcmVzdWx0ID0gc3lzdGVtKGNvbW1hbmQp OwogCi0JaWYgKHJlc3VsdCA9PSAxMjcgfHwgcmVzdWx0ID09IC0xKQorCWlmIChyZXN1bHQgIT0g MCkKIAl7Ci0JCXBnX2xvZ19lcnJvcigiXFwhOiBmYWlsZWQiKTsKLQkJcmV0dXJuIGZhbHNlOwor CQlpZiAocmVzdWx0IDwgMCkKKwkJCXBnX2xvZ19lcnJvcigiY291bGQgbm90IGNsb3NlIHBpcGUg dG8gZXh0ZXJuYWwgY29tbWFuZDogJW0iKTsKKwkJZWxzZQorCQl7CisJCQljaGFyICpyZWFzb24g PSB3YWl0X3Jlc3VsdF90b19zdHIocmVzdWx0KTsKKworCQkJcGdfbG9nX2Vycm9yKCIlczogJXMi LCBjb21tYW5kLCByZWFzb24gPyByZWFzb24gOiAiIik7CisJCQlmcmVlKHJlYXNvbik7CisJCX0K KwkJaWYgKHBzZXQub25fZXJyb3Jfc3RvcCA9PSBQU1FMX0VSUk9SX1NUT1BfU0hFTEwgfHwgcHNl dC5vbl9lcnJvcl9zdG9wID09IFBTUUxfRVJST1JfU1RPUF9BTEwpCisJCQlyZXR1cm4gZmFsc2U7 CiAJfQogCXJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wc3FsL2NvbW1vbi5j IGIvc3JjL2Jpbi9wc3FsL2NvbW1vbi5jCmluZGV4IDRmMzEwYTgwMTkuLjk2NmNkMzRkMjMgMTAw NjQ0Ci0tLSBhL3NyYy9iaW4vcHNxbC9jb21tb24uYworKysgYi9zcmMvYmluL3BzcWwvY29tbW9u LmMKQEAgLTk0LDYgKzk0LDcgQEAgc2V0UUZvdXQoY29uc3QgY2hhciAqZm5hbWUpCiB7CiAJRklM RQkgICAqZm91dDsKIAlib29sCQlpc19waXBlOworCWJvb2wJCXN0YXR1cyA9IHRydWU7CiAKIAkv KiBGaXJzdCBtYWtlIHN1cmUgd2UgY2FuIG9wZW4gdGhlIG5ldyBvdXRwdXQgZmlsZS9waXBlICov CiAJaWYgKCFvcGVuUXVlcnlPdXRwdXRGaWxlKGZuYW1lLCAmZm91dCwgJmlzX3BpcGUpKQpAQCAt MTAzLDcgKzEwNCwyNCBAQCBzZXRRRm91dChjb25zdCBjaGFyICpmbmFtZSkKIAlpZiAocHNldC5x dWVyeUZvdXQgJiYgcHNldC5xdWVyeUZvdXQgIT0gc3Rkb3V0ICYmIHBzZXQucXVlcnlGb3V0ICE9 IHN0ZGVycikKIAl7CiAJCWlmIChwc2V0LnF1ZXJ5Rm91dFBpcGUpCi0JCQlwY2xvc2UocHNldC5x dWVyeUZvdXQpOworCQl7CisJCQlpbnQgcGNsb3NlX3JjID0gcGNsb3NlKHBzZXQucXVlcnlGb3V0 KTsKKwkJCWlmIChwY2xvc2VfcmMgIT0gMCkKKwkJCXsKKwkJCQlpZiAocGNsb3NlX3JjIDwgMCkK KwkJCQkJcGdfbG9nX2Vycm9yKCJjb3VsZCBub3QgY2xvc2UgcGlwZSB0byBleHRlcm5hbCBjb21t YW5kOiAlbSIpOworCQkJCWVsc2UKKwkJCQl7CisJCQkJCWNoYXIgKnJlYXNvbiA9IHdhaXRfcmVz dWx0X3RvX3N0cihwY2xvc2VfcmMpOworCisJCQkJCXBnX2xvZ19lcnJvcigiY29tbWFuZCBmYWls dXJlOiAlcyIsCisJCQkJCQkJCSByZWFzb24gPyByZWFzb24gOiAiIik7CisJCQkJCWZyZWUocmVh c29uKTsKKwkJCQl9CisJCQkJaWYgKChwc2V0Lm9uX2Vycm9yX3N0b3AgPT0gUFNRTF9FUlJPUl9T VE9QX1NIRUxMIHx8IHBzZXQub25fZXJyb3Jfc3RvcCA9PSBQU1FMX0VSUk9SX1NUT1BfQUxMKSkK KwkJCQkJc3RhdHVzID0gZmFsc2U7CisJCQl9CisJCX0KIAkJZWxzZQogCQkJZmNsb3NlKHBzZXQu cXVlcnlGb3V0KTsKIAl9CkBAIC0xMTUsNyArMTMzLDcgQEAgc2V0UUZvdXQoY29uc3QgY2hhciAq Zm5hbWUpCiAJc2V0X3NpZ3BpcGVfdHJhcF9zdGF0ZShpc19waXBlKTsKIAlyZXN0b3JlX3NpZ3Bp cGVfdHJhcCgpOwogCi0JcmV0dXJuIHRydWU7CisJcmV0dXJuIHN0YXR1czsKIH0KIAogCkBAIC0x MzczLDcgKzEzOTEsNyBAQCBEZXNjcmliZVF1ZXJ5KGNvbnN0IGNoYXIgKnF1ZXJ5LCBkb3VibGUg KmVsYXBzZWRfbXNlYykKICAqIEZvciBvdGhlciBjb21tYW5kcywgdGhlIHJlc3VsdHMgYXJlIHBy b2Nlc3NlZCBub3JtYWxseSwgZGVwZW5kaW5nIG9uIHRoZWlyCiAgKiBzdGF0dXMuCiAgKgotICog UmV0dXJucyAxIG9uIGNvbXBsZXRlIHN1Y2Nlc3MsIDAgb24gaW50ZXJydXB0IGFuZCAtMSBvciBl cnJvcnMuICBQb3NzaWJsZQorICogUmV0dXJucyAxIG9uIGNvbXBsZXRlIHN1Y2Nlc3MsIDAgb24g aW50ZXJydXB0IGFuZCAtMSBvbiBlcnJvcnMuICBQb3NzaWJsZQogICogZmFpbHVyZSBtb2RlcyBp bmNsdWRlIHB1cmVseSBjbGllbnQtc2lkZSBwcm9ibGVtczsgY2hlY2sgdGhlIHRyYW5zYWN0aW9u CiAgKiBzdGF0dXMgZm9yIHRoZSBzZXJ2ZXItc2lkZSBvcGluaW9uLgogICoKQEAgLTE2MzUsNyAr MTY1MywyMiBAQCBFeGVjUXVlcnlBbmRQcm9jZXNzUmVzdWx0cyhjb25zdCBjaGFyICpxdWVyeSwK IAl7CiAJCWlmIChnZmlsZV9pc19waXBlKQogCQl7Ci0JCQlwY2xvc2UoZ2ZpbGVfZm91dCk7CisJ CQlpbnQgcGNsb3NlX3JjID0gcGNsb3NlKGdmaWxlX2ZvdXQpOworCQkJaWYgKHBjbG9zZV9yYyAh PSAwKQorCQkJeworCQkJCWlmIChwY2xvc2VfcmMgPCAwKQorCQkJCQlwZ19sb2dfZXJyb3IoImNv dWxkIG5vdCBjbG9zZSBwaXBlIHRvIGV4dGVybmFsIGNvbW1hbmQ6ICVtIik7CisJCQkJZWxzZQor CQkJCXsKKwkJCQkJY2hhciAqcmVhc29uID0gd2FpdF9yZXN1bHRfdG9fc3RyKHBjbG9zZV9yYyk7 CisKKwkJCQkJcGdfbG9nX2Vycm9yKCIlczogJXMiLCBwc2V0LmdmbmFtZSArIDEsCisJCQkJCQkJ CSByZWFzb24gPyByZWFzb24gOiAiIik7CisJCQkJCWZyZWUocmVhc29uKTsKKwkJCQl9CisJCQkJ aWYgKHBzZXQub25fZXJyb3Jfc3RvcCA9PSBQU1FMX0VSUk9SX1NUT1BfU0hFTEwgfHwgcHNldC5v bl9lcnJvcl9zdG9wID09IFBTUUxfRVJST1JfU1RPUF9BTEwpCisJCQkJCXN1Y2Nlc3MgPSBmYWxz ZTsKKwkJCX0KIAkJCXJlc3RvcmVfc2lncGlwZV90cmFwKCk7CiAJCX0KIAkJZWxzZQpAQCAtMTg1 MSw3ICsxODg0LDIyIEBAIEV4ZWNRdWVyeVVzaW5nQ3Vyc29yKGNvbnN0IGNoYXIgKnF1ZXJ5LCBk b3VibGUgKmVsYXBzZWRfbXNlYykKIAkJLyogY2xvc2UgXGcgYXJndW1lbnQgZmlsZS9waXBlICov CiAJCWlmIChpc19waXBlKQogCQl7Ci0JCQlwY2xvc2UoZm91dCk7CisJCQlpbnQgcGNsb3NlX3Jj ID0gcGNsb3NlKGZvdXQpOworCQkJaWYgKHBjbG9zZV9yYyAhPSAwKQorCQkJeworCQkJCWlmIChw Y2xvc2VfcmMgPCAwKQorCQkJCQlwZ19sb2dfZXJyb3IoImNvdWxkIG5vdCBjbG9zZSBwaXBlIHRv IGV4dGVybmFsIGNvbW1hbmQ6ICVtIik7CisJCQkJZWxzZQorCQkJCXsKKwkJCQkJY2hhciAqcmVh c29uID0gd2FpdF9yZXN1bHRfdG9fc3RyKHBjbG9zZV9yYyk7CisKKwkJCQkJcGdfbG9nX2Vycm9y KCIlczogJXMiLCBwc2V0LmdmbmFtZSArIDEsCisJCQkJCQkJCSByZWFzb24gPyByZWFzb24gOiAi Iik7CisJCQkJCWZyZWUocmVhc29uKTsKKwkJCQl9CisJCQkJaWYgKHBzZXQub25fZXJyb3Jfc3Rv cCA9PSBQU1FMX0VSUk9SX1NUT1BfU0hFTEwgfHwgcHNldC5vbl9lcnJvcl9zdG9wID09IFBTUUxf RVJST1JfU1RPUF9BTEwpCisJCQkJCU9LID0gZmFsc2U7CisJCQl9CiAJCQlyZXN0b3JlX3NpZ3Bp cGVfdHJhcCgpOwogCQl9CiAJCWVsc2UKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcHNxbC9wc3Fsc2Nh bnNsYXNoLmwgYi9zcmMvYmluL3BzcWwvcHNxbHNjYW5zbGFzaC5sCmluZGV4IGE0NjdiNzIxNDQu LjhlNWY1YjUwMTAgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcHNxbC9wc3Fsc2NhbnNsYXNoLmwKKysr IGIvc3JjL2Jpbi9wc3FsL3BzcWxzY2Fuc2xhc2gubApAQCAtNTUsNiArNTUsMTAgQEAgc3RhdGlj IGludAliYWNrdGlja19zdGFydF9vZmZzZXQ7CiAjZGVmaW5lIExFWFJFU19PSwkJCTEJLyogT0sg Y29tcGxldGlvbiBvZiBiYWNrc2xhc2ggYXJndW1lbnQgKi8KIAogCisvKiBjb21tYW5kIGV4ZWN1 dGlvbiBpbiBldmFsdWF0ZV9iYWNrdGljaygpIHJlc3VsdHMgaW4gZXJyb3IqLworI2RlZmluZSBD TURfRVJSCQkJCS0xCisKKwogc3RhdGljIHZvaWQgZXZhbHVhdGVfYmFja3RpY2soUHNxbFNjYW5T dGF0ZSBzdGF0ZSk7CiAKICNkZWZpbmUgRUNITyBwc3Fsc2Nhbl9lbWl0KGN1cl9zdGF0ZSwgeXl0 ZXh0LCB5eWxlbmcpCkBAIC04MDAsMTAgKzgwNCwyMyBAQCBldmFsdWF0ZV9iYWNrdGljayhQc3Fs U2NhblN0YXRlIHN0YXRlKQogCQl9IHdoaWxlICghZmVvZihmZCkpOwogCX0KIAotCWlmIChmZCAm JiBwY2xvc2UoZmQpID09IC0xKQorCWlmIChmZCkKIAl7Ci0JCXBnX2xvZ19lcnJvcigiJXM6ICVt IiwgY21kKTsKLQkJZXJyb3IgPSB0cnVlOworCQlpbnQgcGNsb3NlX3JjID0gcGNsb3NlKGZkKTsK KwkJaWYgKHBjbG9zZV9yYyAhPSAwKQorCQl7CisJCQlpZiAocGNsb3NlX3JjIDwgMCkKKwkJCQlw Z19sb2dfZXJyb3IoIiVzOiAlbSIsIGNtZCk7CisJCQllbHNlCisJCQl7CisJCQkJY2hhcgkgICAq cmVhc29uID0gd2FpdF9yZXN1bHRfdG9fc3RyKHBjbG9zZV9yYyk7CisKKwkJCQlwZ19sb2dfZXJy b3IoIiVzOiAlcyIsIGNtZCwKKwkJCQkJCQkJcmVhc29uID8gcmVhc29uIDogIiIpOworCQkJCWZy ZWUocmVhc29uKTsKKwkJCX0KKwkJCWVycm9yID0gdHJ1ZTsKKwkJfQogCX0KIAogCWlmIChQUUV4 cEJ1ZmZlckRhdGFCcm9rZW4oY21kX291dHB1dCkpCkBAIC04MjUsNiArODQyLDEyIEBAIGV2YWx1 YXRlX2JhY2t0aWNrKFBzcWxTY2FuU3RhdGUgc3RhdGUpCiAJCQljbWRfb3V0cHV0Lmxlbi0tOwog CQlhcHBlbmRCaW5hcnlQUUV4cEJ1ZmZlcihvdXRwdXRfYnVmLCBjbWRfb3V0cHV0LmRhdGEsIGNt ZF9vdXRwdXQubGVuKTsKIAl9CisJLyogSWYgZXJyb3IsIHNldCBsZW4gdG8gYSB2YWx1ZSBncmVh dGVyIHRoYW4gb3IgZXF1YWwKKwkgKiB0byBtYXhsZW4gdG8gaW5kaWNhdGUgZXJyb3IgaW4gY29t bWFuZCBleGVjdXRpb24uCisJICogVGhpcyBjYW4gaGVscCB3aXRoIE9OX0VSUk9SX1NUT1AuCisJ ICovCisJZWxzZQorCQlvdXRwdXRfYnVmLT5sZW4gPSBDTURfRVJSOwogCiAJdGVybVBRRXhwQnVm ZmVyKCZjbWRfb3V0cHV0KTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9iaW4vcHNxbC9zZXR0aW5ncy5o IGIvc3JjL2Jpbi9wc3FsL3NldHRpbmdzLmgKaW5kZXggMjM5OWNmZmEzZi4uNTRlN2FlYmRkYiAx MDA2NDQKLS0tIGEvc3JjL2Jpbi9wc3FsL3NldHRpbmdzLmgKKysrIGIvc3JjL2Jpbi9wc3FsL3Nl dHRpbmdzLmgKQEAgLTU0LDYgKzU0LDE0IEBAIHR5cGVkZWYgZW51bQogCVBTUUxfRVJST1JfUk9M TEJBQ0tfT04KIH0gUFNRTF9FUlJPUl9ST0xMQkFDSzsKIAordHlwZWRlZiBlbnVtCit7CisJUFNR TF9FUlJPUl9TVE9QX09GRiwKKwlQU1FMX0VSUk9SX1NUT1BfT04sCisJUFNRTF9FUlJPUl9TVE9Q X1NIRUxMLAorCVBTUUxfRVJST1JfU1RPUF9BTEwKK30gUFNRTF9FUlJPUl9TVE9QOworCiB0eXBl ZGVmIGVudW0KIHsKIAlQU1FMX0NPTVBfQ0FTRV9QUkVTRVJWRV9VUFBFUiwKQEAgLTEzMCw3ICsx MzgsNiBAQCB0eXBlZGVmIHN0cnVjdCBfcHNxbFNldHRpbmdzCiAJICogZnVuY3Rpb25zLgogCSAq LwogCWJvb2wJCWF1dG9jb21taXQ7Ci0JYm9vbAkJb25fZXJyb3Jfc3RvcDsKIAlib29sCQlxdWll dDsKIAlib29sCQlzaW5nbGVsaW5lOwogCWJvb2wJCXNpbmdsZXN0ZXA7CkBAIC0xNDIsNiArMTQ5 LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX3BzcWxTZXR0aW5ncwogCVBTUUxfRUNITwllY2hvOwogCVBT UUxfRUNIT19ISURERU4gZWNob19oaWRkZW47CiAJUFNRTF9FUlJPUl9ST0xMQkFDSyBvbl9lcnJv cl9yb2xsYmFjazsKKwlQU1FMX0VSUk9SX1NUT1AJCW9uX2Vycm9yX3N0b3A7CiAJUFNRTF9DT01Q X0NBU0UgY29tcF9jYXNlOwogCUhpc3RDb250cm9sIGhpc3Rjb250cm9sOwogCWNvbnN0IGNoYXIg KnByb21wdDE7CmRpZmYgLS1naXQgYS9zcmMvYmluL3BzcWwvc3RhcnR1cC5jIGIvc3JjL2Jpbi9w c3FsL3N0YXJ0dXAuYwppbmRleCBmNWI5ZTI2OGYyLi5jYjNmYTg5NDAwIDEwMDY0NAotLS0gYS9z cmMvYmluL3BzcWwvc3RhcnR1cC5jCisrKyBiL3NyYy9iaW4vcHNxbC9zdGFydHVwLmMKQEAgLTg3 NywxMiArODc3LDYgQEAgYXV0b2NvbW1pdF9ob29rKGNvbnN0IGNoYXIgKm5ld3ZhbCkKIAlyZXR1 cm4gUGFyc2VWYXJpYWJsZUJvb2wobmV3dmFsLCAiQVVUT0NPTU1JVCIsICZwc2V0LmF1dG9jb21t aXQpOwogfQogCi1zdGF0aWMgYm9vbAotb25fZXJyb3Jfc3RvcF9ob29rKGNvbnN0IGNoYXIgKm5l d3ZhbCkKLXsKLQlyZXR1cm4gUGFyc2VWYXJpYWJsZUJvb2wobmV3dmFsLCAiT05fRVJST1JfU1RP UCIsICZwc2V0Lm9uX2Vycm9yX3N0b3ApOwotfQotCiBzdGF0aWMgYm9vbAogcXVpZXRfaG9vayhj b25zdCBjaGFyICpuZXd2YWwpCiB7CkBAIC0xMDM2LDYgKzEwMzAsMjkgQEAgb25fZXJyb3Jfcm9s bGJhY2tfaG9vayhjb25zdCBjaGFyICpuZXd2YWwpCiAJcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRp YyBib29sCitvbl9lcnJvcl9zdG9wX2hvb2soY29uc3QgY2hhciAqbmV3dmFsKQoreworCUFzc2Vy dChuZXd2YWwgIT0gTlVMTCk7CQkvKiBlbHNlIHN1YnN0aXR1dGUgaG9vayBtZXNzZWQgdXAgKi8K KwlpZiAocGdfc3RyY2FzZWNtcChuZXd2YWwsICJzaGVsbCIpID09IDApCisJCXBzZXQub25fZXJy b3Jfc3RvcCA9IFBTUUxfRVJST1JfU1RPUF9TSEVMTDsKKwllbHNlIGlmIChwZ19zdHJjYXNlY21w KG5ld3ZhbCwgImFsbCIpID09IDApCisJCXBzZXQub25fZXJyb3Jfc3RvcCA9IFBTUUxfRVJST1Jf U1RPUF9BTEw7CisJZWxzZQorCXsKKwkJYm9vbAkJb25fb2ZmOworCisJCWlmIChQYXJzZVZhcmlh YmxlQm9vbChuZXd2YWwsIE5VTEwsICZvbl9vZmYpKQorCQkJcHNldC5vbl9lcnJvcl9zdG9wID0g b25fb2ZmID8gUFNRTF9FUlJPUl9TVE9QX09OIDogUFNRTF9FUlJPUl9TVE9QX09GRjsKKwkJZWxz ZQorCQl7CisJCQlQc3FsVmFyRW51bUVycm9yKCJPTl9FUlJPUl9TVE9QIiwgbmV3dmFsLCAib24s IG9mZiwgc2hlbGwsIGFsbCIpOworCQkJcmV0dXJuIGZhbHNlOworCQl9CisJfQorCXJldHVybiB0 cnVlOworfQorCiBzdGF0aWMgY2hhciAqCiBjb21wX2tleXdvcmRfY2FzZV9zdWJzdGl0dXRlX2hv b2soY2hhciAqbmV3dmFsKQogewo= --=_45c2f97471863dd511878e1f36223f9e--