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 1tN3FR-008Cyl-BZ for pgsql-hackers@arkaria.postgresql.org; Mon, 16 Dec 2024 05:02:25 +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 1tN3FO-002pxB-St for pgsql-hackers@arkaria.postgresql.org; Mon, 16 Dec 2024 05:02:24 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tN3FO-002px3-GR for pgsql-hackers@lists.postgresql.org; Mon, 16 Dec 2024 05:02:23 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1tN3FM-0035MB-SS for pgsql-hackers@postgresql.org; Mon, 16 Dec 2024 05:02:23 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-728f1525565so4270277b3a.1 for ; Sun, 15 Dec 2024 21:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734325339; x=1734930139; darn=postgresql.org; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ge+91yVrFHzSc8iNCrGRsPxzF4ABoNsGqSj36XXw/Ig=; b=UERIove3pcF+5OH8qiCPF9yPGMaq6g31AkSL494yvILLUktp2dsHnpDh6GcWtYCY9y VKFbPlRKEDe6OUMwxJyMccqn3GnWf3Fp8dx5mZqkNocZifdufh7kXX/UjkLpEtrDZytD W9xpcdVaRhQUHUkrZ928rjk/wVRNeIz5E1UzNKTXGEi4FlSq1Imymm53y+zIl5wIqXsr 9uptH+UyMpHPAgKVqjUfeG+dyJNPKmJlTpRml0floWbMVj8EFxnHpy5HTWVEpe4x4/7A vcnF+PXG3lSkAMsnoScZ0xAHLuzPwFY+CmWn9HgLydS7waBYMxMVsjgQijYPK5lolOjf yuTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734325339; x=1734930139; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ge+91yVrFHzSc8iNCrGRsPxzF4ABoNsGqSj36XXw/Ig=; b=ZqYUjEB180/RtgDTIsZlga0ch/T41VEkYc7e0vp1mCfRvJcvpSEYWxhpK8sq2hTKqf O+oi1TslnguKNQZQLjU5XgRz5mwQmv5sIvUl90OZBxxmx+/iLv3W2XCRDQH9PgM5CQey VtT+rOaGRP9M2/JCH5pa41GOFtIXGBb8Nri4fhlM6QJKkACrFKZ/dIciaCdpE9VXRNUK FZ+30TAV82dkXdZdK/6Z6Q8HJ9NZTu5CKbSZczKjGJPJu2BPJb+3NjS8UJbuOikyBy+F IoOvf1W1fqLVTVbWwthZ4jhnvmJBTML/B+E9y7QBAJkQwSz2/pMlOu9NXg5KQUwMA5KL g+nA== X-Forwarded-Encrypted: i=1; AJvYcCU/+bib94s+FYpRo2yOSIgTaE09WD5FU62hxMZkPL8iXe3ekVmw0Fmk2QFt7x7vMZogWTHNRqlFluco8VUl@postgresql.org X-Gm-Message-State: AOJu0Yzx0DD1vLVtaAyvRX48juDotR4L8nTdxHAilsvIGLLZmqNwYp55 61ECF7tWAhE+4pQLy8E71DcfRQA/XkVZPCzlbI70i7b5i1KAvPRnnu/ESQ== X-Gm-Gg: ASbGncvJzlbQLuLeCYT7bb/JXPsrBKdR20L+gUuzoqa/6Ae+6oLUv/Yi2ZKOFNY7jh3 qzlMmsYluUbVExuUVBaenvDYHi0M2WIM27X6QbJi98xRB1dzncE+wtWBeCdfRoeQcGur1Zx2Lmc p2OXsIsk0O8WRjOrQ5xSds1gcY8LMPwDF2IpRUGdUYkVbxwpvozvX1coUVT0ef/+GXzkkrHz6oO xDE0Yfv2kxGuEDWABNWQf5xApJo97UpSbglsQtr4AW1Db7ceHMqiZO7t8cUh0ZNJtREIJvee3Oa JtN7nLz1y+U6k5KtrZxC1U3Q9Ze1/LIu X-Google-Smtp-Source: AGHT+IFCB9LxVYfkiMrrNNKMYzIDjplZEBBz8Mst2fXFCxHLIRu9WlXq5ZnEKOMFnyXPUmeAp73nqQ== X-Received: by 2002:a05:6a21:6da9:b0:1e1:af74:a236 with SMTP id adf61e73a8af0-1e1dfd7907fmr15611565637.21.1734325338657; Sun, 15 Dec 2024 21:02:18 -0800 (PST) Received: from [10.10.20.106] (node-oou.pool-125-26.dynamic.totinternet.net. [125.26.124.254]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-801d5ad43e2sm3302395a12.45.2024.12.15.21.02.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 15 Dec 2024 21:02:17 -0800 (PST) Content-Type: multipart/mixed; boundary="------------2oA0ks46EUv0lHjjvXPyUXp1" Message-ID: <0e82bf8c-ae70-498d-861e-dba2bb154cad@gmail.com> Date: Mon, 16 Dec 2024 12:02:14 +0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Add Postgres module info To: Tom Lane Cc: Yurii Rashkovskii , PostgreSQL-development References: <506788.1733941263@sss.pgh.pa.us> <2c215c98-f713-4c5b-b21a-a4b8fa41890b@gmail.com> <556341.1733967371@sss.pgh.pa.us> <0844622e-9967-409a-8038-470a36f1039c@gmail.com> <8b81a3c0-761f-4cfb-97c6-68819fe4d282@gmail.com> <982748.1734059835@sss.pgh.pa.us> Content-Language: en-AU From: Andrei Lepikhov In-Reply-To: <982748.1734059835@sss.pgh.pa.us> 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. --------------2oA0ks46EUv0lHjjvXPyUXp1 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/13/24 10:17, Tom Lane wrote: > Andrei Lepikhov writes: >> On 12/12/24 21:02, Yurii Rashkovskii wrote: >>> 2. Any reasons to dictate MAJ.MIN format? With semantic versioning >>> abound, it's rather common to use MAJ.MIN.PATCH. > >> Okay, thanks; that's a good catch. I wonder how to follow these rules >> with a static fixed-sized structure. I would like to read about any >> suggestions and implementation examples. > > There's nothing stopping a field of the magic block from being > a "const char *" pointer to a string literal. Ok, See v.2 in attachment. -- regards, Andrei Lepikhov --------------2oA0ks46EUv0lHjjvXPyUXp1 Content-Type: text/x-patch; charset=UTF-8; name="v2-0001-Introduce-PG_MODULE_MAGIC_EXT-macro.patch" Content-Disposition: attachment; filename="v2-0001-Introduce-PG_MODULE_MAGIC_EXT-macro.patch" Content-Transfer-Encoding: base64 RnJvbSBjYTM5NTcyNjRhNjhkYzc4NzFiOThhZGE0Y2RkZTFlZTI2YWVmYWRlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmVpIFYuIExlcGlraG92IiA8bGVwaWhvdkBn bWFpbC5jb20+CkRhdGU6IFR1ZSwgMTkgTm92IDIwMjQgMTg6NDU6MzYgKzA3MDAKU3ViamVj dDogW1BBVENIIHYyXSBJbnRyb2R1Y2UgUEdfTU9EVUxFX01BR0lDX0VYVCBtYWNyby4KClRo aXMgbWFjcm8gcHJvdmlkZXMgZHluYW1pY2FsbHkgbG9hZGVkIHNoYXJlZCBsaWJyYXJpZXMg KG1vZHVsZXMpIHdpdGggc3RhbmRhcmQKd2F5IHRvIGluY29ycG9yYXRlIHZlcnNpb24gKHN1 cHBvc2VkbHksIGRlZmluZWQgYWNjb3JkaW5nIHRvIHNlbWFudGljIHZlcnNpb25pbmcKc3Bl Y2lmaWNhdGlvbikgYW5kIG5hbWUgZGF0YS4gVGhlIGludHJvZHVjZWQgY2F0YWxvZ3VlIHJv dXRpbmUgbW9kdWxlX2luZm8gY2FuCmJlIHVzZWQgdG8gZmluZCB0aGlzIG1vZHVsZSBieSBu YW1lIGFuZCBjaGVjayB0aGUgdmVyc2lvbi4gSXQgbWFrZXMgdXNlcnMKaW5kZXBlbmRlbnQg ZnJvbSBmaWxlIG5hbWluZyBjb252ZW50aW9ucy4KCldpdGggYSBncm93aW5nIG51bWJlciBv ZiBQb3N0Z3JlcyBjb3JlIGhvb2tzIGFuZCB0aGUgaW50cm9kdWN0aW9uIG9mIG5hbWVkIERT TQpzZWdtZW50cywgdGhlIG51bWJlciBvZiBtb2R1bGVzIHRoYXQgZG9uJ3QgbmVlZCB0byBi ZSBsb2FkZWQgb24gc3RhcnR1cCBtYXkKZ3JvdyBmYXN0LiBNb3Jlb3ZlciwgaW4gbWFueSBj YXNlcyByZWxhdGVkIHRvIHF1ZXJ5IHRyZWUgdHJhbnNmb3JtYXRpb24gb3IKZXh0cmEgcGF0 aCByZWNvbW1lbmRhdGlvbiwgc3VjaCBtb2R1bGVzIG1pZ2h0IG5vdCBuZWVkIGRhdGFiYXNl IG9iamVjdHMgZXhjZXB0CkdVQ3MgLSBzZWUgYXV0b19leHBsYWluIGFzIGFuIGV4YW1wbGUu IFRoYXQgbWVhbnMgdGhleSBkb24ndCBuZWVkIHRvIGV4ZWN1dGUKdGhlICdDUkVBVEUgRVhU RU5TSU9OJyBzdGF0ZW1lbnQgYXQgYWxsIGFuZCBkb24ndCBoYXZlIGEgcmVjb3JkIGluCnRo ZSBwZ19leHRlbnNpb24gdGFibGUuIFN1Y2ggYSB0cmljayBwcm92aWRlcyBtdWNoIGZsZXhp YmlsaXR5LCBpbmNsdWRpbmcKYW4gb25saW5lIHVwZ3JhZGUgYW5kIG1heSBiZWNvbWUgd2lk ZXNwcmVhZC4KCkluIGFkZGl0aW9uLCBpdCBpcyBhbHNvIGNvbnZlbmllbnQgaW4gc3VwcG9y dCB0byBiZSBzdXJlIHRoYXQgdGhlIGluc3RhbGxhdGlvbgoob3IgYXQgbGVhc3QgdGhlIGJh Y2tlbmQpIGluY2x1ZGVzIGEgc3BlY2lmaWMgdmVyc2lvbiBvZiB0aGUgbW9kdWxlLiBFdmVu IGlmCmEgbW9kdWxlIGhhcyBhbiBpbnN0YWxsYXRpb24gc2NyaXB0LCBpdCBpcyBub3QgcmFy ZSB0aGF0IGl0IHByb3ZpZGVzCmFuIGltcGxlbWVudGF0aW9uIGZvciBhIHJhbmdlIG9mIFVJ IHJvdXRpbmUgdmVyc2lvbnMuIEl0IG1ha2VzIHNlbnNlIHRvIGVuc3VyZQp3aGljaCBzcGVj aWZpYyB2ZXJzaW9uIG9mIHRoZSBjb2RlIGlzIHVzZWQuCgpEaXNjdXNzaW9ucyBbMSwyXSBh bHJlYWR5IG1lbnRpb25lZCBtb2R1bGUtaW5mbyBzdHVmZiwgYnV0IGF0IHRoYXQgdGltZSwK ZXh0ZW5zaWJpbGl0eSB0ZWNobmlxdWVzIGFuZCBleHRlbnNpb24gcG9wdWxhcml0eSB3ZXJl IGxvdywgYW5kIGl0IHdhc24ndApuZWNlc3NhcnkgdG8gcHJvdmlkZSB0aGF0IGRhdGEuCgpb MV0gaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvbWVzc2FnZS1pZC9mbGF0LzIwMDYwNTA3 MjExNzA1LkdCMzgwOCU0MHN2YW5hLm9yZwpbMl0gaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5v cmcvbWVzc2FnZS1pZC9mbGF0LzIwMDUxMTA2MTYyNjU4LjM0YzMxZDU3JTQwdGh1bmRlci5s b2dpY2FsY2hhb3Mub3JnCi0tLQogY29udHJpYi9hdXRvX2V4cGxhaW4vYXV0b19leHBsYWlu LmMgICAgICAgIHwgIDUgKy0KIGNvbnRyaWIvYXV0b19leHBsYWluL3QvMDAxX2F1dG9fZXhw bGFpbi5wbCB8ICA4ICsrKwogY29udHJpYi9wZ19wcmV3YXJtL3QvMDAxX2Jhc2ljLnBsICAg ICAgICAgIHwgIDggKystCiBzcmMvYmFja2VuZC91dGlscy9mbWdyL2RmbWdyLmMgICAgICAg ICAgICAgfCA2MiArKysrKysrKysrKysrKysrKysrKystCiBzcmMvaW5jbHVkZS9jYXRhbG9n L3BnX3Byb2MuZGF0ICAgICAgICAgICAgfCAgNiArKysKIHNyYy9pbmNsdWRlL2ZtZ3IuaCAg ICAgICAgICAgICAgICAgICAgICAgICB8IDI4ICsrKysrKysrLS0KIDYgZmlsZXMgY2hhbmdl ZCwgMTEwIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvY29u dHJpYi9hdXRvX2V4cGxhaW4vYXV0b19leHBsYWluLmMgYi9jb250cmliL2F1dG9fZXhwbGFp bi9hdXRvX2V4cGxhaW4uYwppbmRleCBmMmVhYThlNDk0Li5hYjk5NzgzMGYzIDEwMDY0NAot LS0gYS9jb250cmliL2F1dG9fZXhwbGFpbi9hdXRvX2V4cGxhaW4uYworKysgYi9jb250cmli L2F1dG9fZXhwbGFpbi9hdXRvX2V4cGxhaW4uYwpAQCAtMjAsNyArMjAsMTAgQEAKICNpbmNs dWRlICJleGVjdXRvci9pbnN0cnVtZW50LmgiCiAjaW5jbHVkZSAidXRpbHMvZ3VjLmgiCiAK LVBHX01PRFVMRV9NQUdJQzsKK1BHX01PRFVMRV9NQUdJQ19FWFQoCisJLm5hbWUgPSAiYXV0 b19leHBsYWluIiwKKwkudmVyc2lvbiA9ICIxLjAuMCIKKyk7CiAKIC8qIEdVQyB2YXJpYWJs ZXMgKi8KIHN0YXRpYyBpbnQJYXV0b19leHBsYWluX2xvZ19taW5fZHVyYXRpb24gPSAtMTsg LyogbXNlYyBvciAtMSAqLwpkaWZmIC0tZ2l0IGEvY29udHJpYi9hdXRvX2V4cGxhaW4vdC8w MDFfYXV0b19leHBsYWluLnBsIGIvY29udHJpYi9hdXRvX2V4cGxhaW4vdC8wMDFfYXV0b19l eHBsYWluLnBsCmluZGV4IDBlNWIzNGFmYTkuLjgxNDgxNjA2ZGEgMTAwNjQ0Ci0tLSBhL2Nv bnRyaWIvYXV0b19leHBsYWluL3QvMDAxX2F1dG9fZXhwbGFpbi5wbAorKysgYi9jb250cmli L2F1dG9fZXhwbGFpbi90LzAwMV9hdXRvX2V4cGxhaW4ucGwKQEAgLTUzLDYgKzUzLDE0IEBA IGxpa2UoCiAJcXIvU2VxIFNjYW4gb24gcGdfY2xhc3MvLAogCSJzZXF1ZW50aWFsIHNjYW4g bG9nZ2VkLCB0ZXh0IG1vZGUiKTsKIAorJGxvZ19jb250ZW50cyA9ICRub2RlLT5zYWZlX3Bz cWwoCisJInBvc3RncmVzIiwgcXtTRUxFQ1Qgc3Vic3RyaW5nKGxpYm5hbWUsICdhdXRvX2V4 cGxhaW4nKSxtb2R1bGVfbmFtZSx2ZXJzaW9uCisJCQkJICBGUk9NIG1vZHVsZV9pbmZvKCkg V0hFUkUgdmVyc2lvbiBJUyBOT1QgTlVMTDt9KTsKK2xpa2UoCisJJGxvZ19jb250ZW50cywK Kwlxci9hdXRvX2V4cGxhaW5cfGF1dG9fZXhwbGFpblx8MVwuMFwuMC8sCisJIkNoZWNrIG1v ZHVsZSB2ZXJzaW9uIik7CisKICMgUHJlcGFyZWQgcXVlcnkuCiAkbG9nX2NvbnRlbnRzID0g cXVlcnlfbG9nKCRub2RlLAogCXF7UFJFUEFSRSBnZXRfcHJvYyhuYW1lKSBBUyBTRUxFQ1Qg KiBGUk9NIHBnX3Byb2MgV0hFUkUgcHJvbmFtZSA9ICQxOyBFWEVDVVRFIGdldF9wcm9jKCdp bnQ0cGwnKTt9CmRpZmYgLS1naXQgYS9jb250cmliL3BnX3ByZXdhcm0vdC8wMDFfYmFzaWMu cGwgYi9jb250cmliL3BnX3ByZXdhcm0vdC8wMDFfYmFzaWMucGwKaW5kZXggODI1ZDM0NDhl ZS4uMTc0ODIyYmVmYyAxMDA2NDQKLS0tIGEvY29udHJpYi9wZ19wcmV3YXJtL3QvMDAxX2Jh c2ljLnBsCisrKyBiL2NvbnRyaWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5wbApAQCAtMjUs OCArMjUsMTQgQEAgJG5vZGUtPnNhZmVfcHNxbCgicG9zdGdyZXMiLAogCSAgLiAiQ1JFQVRF IFRBQkxFIHRlc3QoYzEgaW50KTtcbiIKIAkgIC4gIklOU0VSVCBJTlRPIHRlc3QgU0VMRUNU IGdlbmVyYXRlX3NlcmllcygxLCAxMDApOyIpOwogCi0jIHRlc3QgcmVhZCBtb2RlCisjIHRl c3QgZW1wdHkgbW9kdWxlIGluZm8KIG15ICRyZXN1bHQgPQorICAkbm9kZS0+c2FmZV9wc3Fs KCJwb3N0Z3JlcyIsICJTRUxFQ1Qgc3Vic3RyaW5nKGxpYm5hbWUsICdwZ19wcmV3YXJtJyks CisgIAkJCQkJCW1vZHVsZV9uYW1lLHZlcnNpb24gRlJPTSBtb2R1bGVfaW5mbygpOyIpOwor bGlrZSgkcmVzdWx0LCBxci9wZ19wcmV3YXJtXHxcfC8sICdSZXR1cm4gbnVsbCBpZiBtb2R1 bGUgZG9lcyBub3QgcHJvdmlkZSBhbiBpbmZvJyk7CisKKyMgdGVzdCByZWFkIG1vZGUKKyRy ZXN1bHQgPQogICAkbm9kZS0+c2FmZV9wc3FsKCJwb3N0Z3JlcyIsICJTRUxFQ1QgcGdfcHJl d2FybSgndGVzdCcsICdyZWFkJyk7Iik7CiBsaWtlKCRyZXN1bHQsIHFyL15bMS05XVswLTld KiQvLCAncmVhZCBtb2RlIHN1Y2NlZWRlZCcpOwogCmRpZmYgLS1naXQgYS9zcmMvYmFja2Vu ZC91dGlscy9mbWdyL2RmbWdyLmMgYi9zcmMvYmFja2VuZC91dGlscy9mbWdyL2RmbWdyLmMK aW5kZXggOGU4MWVjYzc0OS4uMjBjY2EzZTNkNSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQv dXRpbHMvZm1nci9kZm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL2ZtZ3IvZGZtZ3Iu YwpAQCAtMjEsMTAgKzIxLDEyIEBACiAjZW5kaWYJCQkJCQkJLyogIVdJTjMyICovCiAKICNp bmNsdWRlICJmbWdyLmgiCisjaW5jbHVkZSAiZnVuY2FwaS5oIgogI2luY2x1ZGUgImxpYi9z dHJpbmdpbmZvLmgiCiAjaW5jbHVkZSAibWlzY2FkbWluLmgiCiAjaW5jbHVkZSAic3RvcmFn ZS9mZC5oIgogI2luY2x1ZGUgInN0b3JhZ2Uvc2htZW0uaCIKKyNpbmNsdWRlICJ1dGlscy9i dWlsdGlucy5oIgogI2luY2x1ZGUgInV0aWxzL2hzZWFyY2guaCIKIAogCkBAIC01MSw2ICs1 Myw3IEBAIHR5cGVkZWYgc3RydWN0IGRmX2ZpbGVzCiAJaW5vX3QJCWlub2RlOwkJCS8qIElu b2RlIG51bWJlciBvZiBmaWxlICovCiAjZW5kaWYKIAl2b2lkCSAgICpoYW5kbGU7CQkJLyog YSBoYW5kbGUgZm9yIHBnX2RsKiBmdW5jdGlvbnMgKi8KKwljb25zdCBwZ19tb2R1bGVfaW5m byAqbWluZm87CiAJY2hhcgkJZmlsZW5hbWVbRkxFWElCTEVfQVJSQVlfTUVNQkVSXTsJLyog RnVsbCBwYXRobmFtZSBvZiBmaWxlICovCiB9IER5bmFtaWNGaWxlTGlzdDsKIApAQCAtNzUs NyArNzgsNyBAQCBzdGF0aWMgY2hhciAqc3Vic3RpdHV0ZV9saWJwYXRoX21hY3JvKGNvbnN0 IGNoYXIgKm5hbWUpOwogc3RhdGljIGNoYXIgKmZpbmRfaW5fZHluYW1pY19saWJwYXRoKGNv bnN0IGNoYXIgKmJhc2VuYW1lKTsKIAogLyogTWFnaWMgc3RydWN0dXJlIHRoYXQgbW9kdWxl IG5lZWRzIHRvIG1hdGNoIHRvIGJlIGFjY2VwdGVkICovCi1zdGF0aWMgY29uc3QgUGdfbWFn aWNfc3RydWN0IG1hZ2ljX2RhdGEgPSBQR19NT0RVTEVfTUFHSUNfREFUQTsKK3N0YXRpYyBj b25zdCBQZ19tYWdpY19zdHJ1Y3QgbWFnaWNfZGF0YSA9IFBHX01PRFVMRV9NQUdJQ19EQVRB KDApOwogCiAKIC8qCkBAIC0yNDUsOCArMjQ4LDE0IEBAIGludGVybmFsX2xvYWRfbGlicmFy eShjb25zdCBjaGFyICpsaWJuYW1lKQogCQl7CiAJCQljb25zdCBQZ19tYWdpY19zdHJ1Y3Qg Km1hZ2ljX2RhdGFfcHRyID0gKCptYWdpY19mdW5jKSAoKTsKIAorCQkJLyoKKwkJCSAqIENo ZWNrIG1hZ2ljIGZpZWxkIGZyb20gbG9hZGluZyBsaWJyYXJ5IHRvIGJlIHN1cmUgaXQgIGNv bXBpbGVkCisJCQkgKiBmb3IgdGhlIHNhbWUgUG9zdGdyZXMgY29kZS4gU2tpcCBtYWludGFp bmVyIGZpZWxkcyBhdCB0aGUgZW5kCisJCQkgKiBvZiB0aGUgc3RydWN0LgorCQkJICovCiAJ CQlpZiAobWFnaWNfZGF0YV9wdHItPmxlbiAhPSBtYWdpY19kYXRhLmxlbiB8fAotCQkJCW1l bWNtcChtYWdpY19kYXRhX3B0ciwgJm1hZ2ljX2RhdGEsIG1hZ2ljX2RhdGEubGVuKSAhPSAw KQorCQkJCW1lbWNtcChtYWdpY19kYXRhX3B0ciwgJm1hZ2ljX2RhdGEsCisJCQkJCSAgIG9m ZnNldG9mKFBnX21hZ2ljX3N0cnVjdCwgbW9kdWxlX2V4dHJhKSkgIT0gMCkKIAkJCXsKIAkJ CQkvKiBjb3B5IGRhdGEgYmxvY2sgYmVmb3JlIHVubGlua2luZyBsaWJyYXJ5ICovCiAJCQkJ UGdfbWFnaWNfc3RydWN0IG1vZHVsZV9tYWdpY19kYXRhID0gKm1hZ2ljX2RhdGFfcHRyOwpA QCAtMjU4LDYgKzI2Nyw5IEBAIGludGVybmFsX2xvYWRfbGlicmFyeShjb25zdCBjaGFyICps aWJuYW1lKQogCQkJCS8qIGlzc3VlIHN1aXRhYmxlIGNvbXBsYWludCAqLwogCQkJCWluY29t cGF0aWJsZV9tb2R1bGVfZXJyb3IobGlibmFtZSwgJm1vZHVsZV9tYWdpY19kYXRhKTsKIAkJ CX0KKworCQkJLyogU2F2ZSBsaW5rIHRvIHRoZSBtYWludGFpbmVyLXByb3ZpZGVkIGluZm8g Ki8KKwkJCWZpbGVfc2Nhbm5lci0+bWluZm8gPSAmbWFnaWNfZGF0YV9wdHItPm1vZHVsZV9l eHRyYTsKIAkJfQogCQllbHNlCiAJCXsKQEAgLTY3NSwzICs2ODcsNDkgQEAgUmVzdG9yZUxp YnJhcnlTdGF0ZShjaGFyICpzdGFydF9hZGRyZXNzKQogCQlzdGFydF9hZGRyZXNzICs9IHN0 cmxlbihzdGFydF9hZGRyZXNzKSArIDE7CiAJfQogfQorCitEYXR1bQorbW9kdWxlX2luZm8o UEdfRlVOQ1RJT05fQVJHUykKK3sKKwlGdW5jQ2FsbENvbnRleHQJICAgKmZ1bmNjdHg7CisJ TWVtb3J5Q29udGV4dAkJb2xkY29udGV4dDsKKwlEeW5hbWljRmlsZUxpc3QJICAgKmZpbGVf c2Nhbm5lciA9IE5VTEw7CisJVHVwbGVEZXNjCQkJdHVwZGVzYzsKKwlEYXR1bQkJCQlyZXN1 bHQ7CisJRGF0dW0JCQkJdmFsdWVzWzNdOworCWJvb2wJCQkJaXNudWxsWzNdID0gezAsMCww fTsKKworCWlmIChTUkZfSVNfRklSU1RDQUxMKCkpCisJeworCQlmdW5jY3R4ID0gU1JGX0ZJ UlNUQ0FMTF9JTklUKCk7CisJCW9sZGNvbnRleHQgPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8o ZnVuY2N0eC0+bXVsdGlfY2FsbF9tZW1vcnlfY3R4KTsKKworCQlpZiAoZ2V0X2NhbGxfcmVz dWx0X3R5cGUoZmNpbmZvLCBOVUxMLCAmdHVwZGVzYykgIT0gVFlQRUZVTkNfQ09NUE9TSVRF KQorCQkJZWxvZyhFUlJPUiwgInJldHVybiB0eXBlIG11c3QgYmUgYSByb3cgdHlwZSIpOwor CisJCWZpbGVfc2Nhbm5lciA9IGZpbGVfbGlzdDsKKworCQlNZW1vcnlDb250ZXh0U3dpdGNo VG8ob2xkY29udGV4dCk7CisJfQorCisJZnVuY2N0eCA9IFNSRl9QRVJDQUxMX1NFVFVQKCk7 CisKKwlpZiAoZmlsZV9zY2FubmVyICE9IE5VTEwpCisJeworCQlpZiAoZmlsZV9zY2FubmVy LT5taW5mby0+bmFtZSA9PSBOVUxMKQorCQkJaXNudWxsWzBdID0gdHJ1ZTsKKwkJZWxzZQor CQkJdmFsdWVzWzBdID0gQ1N0cmluZ0dldFRleHREYXR1bShmaWxlX3NjYW5uZXItPm1pbmZv LT5uYW1lKTsKKwkJaWYgKGZpbGVfc2Nhbm5lci0+bWluZm8tPnZlcnNpb24gPT0gTlVMTCkK KwkJCWlzbnVsbFsxXSA9IHRydWU7CisJCWVsc2UKKwkJCXZhbHVlc1sxXSA9IENTdHJpbmdH ZXRUZXh0RGF0dW0oZmlsZV9zY2FubmVyLT5taW5mby0+dmVyc2lvbik7CisKKwkJdmFsdWVz WzJdID0gQ1N0cmluZ0dldFRleHREYXR1bShmaWxlX3NjYW5uZXItPmZpbGVuYW1lKTsKKwkJ cmVzdWx0ID0gSGVhcFR1cGxlR2V0RGF0dW0oaGVhcF9mb3JtX3R1cGxlKHR1cGRlc2MsIHZh bHVlcywgaXNudWxsKSk7CisJCWZpbGVfc2Nhbm5lciA9IGZpbGVfc2Nhbm5lci0+bmV4dDsK KwkJU1JGX1JFVFVSTl9ORVhUKGZ1bmNjdHgsIHJlc3VsdCk7CisJfQorCWVsc2UKKwkJU1JG X1JFVFVSTl9ET05FKGZ1bmNjdHgpOworfQpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvY2F0 YWxvZy9wZ19wcm9jLmRhdCBiL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQKaW5k ZXggMGYyMmMyMTcyMy4uNTFjYjIzZjgyNyAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvY2F0 YWxvZy9wZ19wcm9jLmRhdAorKysgYi9zcmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0 CkBAIC0zMTEsNiArMzExLDEyIEBACiAgIHByb25hbWUgPT4gJ3NjYWxhcmd0am9pbnNlbCcs IHByb3ZvbGF0aWxlID0+ICdzJywgcHJvcmV0dHlwZSA9PiAnZmxvYXQ4JywKICAgcHJvYXJn dHlwZXMgPT4gJ2ludGVybmFsIG9pZCBpbnRlcm5hbCBpbnQyIGludGVybmFsJywKICAgcHJv c3JjID0+ICdzY2FsYXJndGpvaW5zZWwnIH0sCit7IG9pZCA9PiAnMTExJywgZGVzY3IgPT4g J01vZHVsZSBJbmZvJywKKyAgcHJvbmFtZSA9PiAnbW9kdWxlX2luZm8nLCBwcm92b2xhdGls ZSA9PiAncycsIHByb3JldHR5cGUgPT4gJ3JlY29yZCcsCisgIHByb3JldHNldCA9PiAndCcs IHByb2FyZ3R5cGVzID0+ICcnLCBwcm9hbGxhcmd0eXBlcyA9PiAne3RleHQsdGV4dCx0ZXh0 fScsCisgIHByb2FyZ21vZGVzID0+ICd7byxvLG99JywgcHJvcm93cyA9PiAxMCwKKyAgcHJv YXJnbmFtZXMgPT4gJ3ttb2R1bGVfbmFtZSx2ZXJzaW9uLGxpYm5hbWV9JywKKyAgcHJvc3Jj ID0+ICdtb2R1bGVfaW5mbycgfSwKIAogeyBvaWQgPT4gJzMzNicsCiAgIGRlc2NyID0+ICdy ZXN0cmljdGlvbiBzZWxlY3Rpdml0eSBvZiA8PSBhbmQgcmVsYXRlZCBvcGVyYXRvcnMgb24g c2NhbGFyIGRhdGF0eXBlcycsCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9mbWdyLmggYi9z cmMvaW5jbHVkZS9mbWdyLmgKaW5kZXggMWUzNzk1ZGU0YS4uZWEyMWUxNTMzMiAxMDA2NDQK LS0tIGEvc3JjL2luY2x1ZGUvZm1nci5oCisrKyBiL3NyYy9pbmNsdWRlL2ZtZ3IuaApAQCAt NDU5LDYgKzQ1OSwxMiBAQCBleHRlcm4gUEdETExFWFBPUlQgdm9pZCBfUEdfaW5pdCh2b2lk KTsKICAqLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICovCiAKK3R5cGVkZWYgc3RydWN0IHBnX21v ZHVsZV9pbmZvCit7CisJY29uc3QgY2hhciAqbmFtZTsKKwljb25zdCBjaGFyICp2ZXJzaW9u OworfSBwZ19tb2R1bGVfaW5mbzsKKwogLyogRGVmaW5pdGlvbiBvZiB0aGUgbWFnaWMgYmxv Y2sgc3RydWN0dXJlICovCiB0eXBlZGVmIHN0cnVjdAogewpAQCAtNDY5LDEwICs0NzUsMTUg QEAgdHlwZWRlZiBzdHJ1Y3QKIAlpbnQJCQluYW1lZGF0YWxlbjsJLyogTkFNRURBVEFMRU4g Ki8KIAlpbnQJCQlmbG9hdDhieXZhbDsJLyogRkxPQVQ4UEFTU0JZVkFMICovCiAJY2hhcgkJ YWJpX2V4dHJhWzMyXTsJLyogc2VlIHBnX2NvbmZpZ19tYW51YWwuaCAqLworCXBnX21vZHVs ZV9pbmZvIG1vZHVsZV9leHRyYTsKIH0gUGdfbWFnaWNfc3RydWN0OwogCi0vKiBUaGUgYWN0 dWFsIGRhdGEgYmxvY2sgY29udGVudHMgKi8KLSNkZWZpbmUgUEdfTU9EVUxFX01BR0lDX0RB VEEgXAorLyogVGhlIGFjdHVhbCBkYXRhIGJsb2NrIGNvbnRlbnRzCisgKgorICogRmlsbCB0 aGUgbW9kdWxlIGluZm8gcGFydCB3aXRoIHplcm9zIGJ5IGRlZmF1bHQuIFplcm8tbGVuZ3Ro IG1vZHVsZSBuYW1lCisgKiBpbmRpY2F0ZXMgdGhhdCBpdCBpcyBub3QgaW5pdGlhbGlzZWQu CisgKi8KKyNkZWZpbmUgUEdfTU9EVUxFX01BR0lDX0RBVEEoLi4uKSBcCiB7IFwKIAlzaXpl b2YoUGdfbWFnaWNfc3RydWN0KSwgXAogCVBHX1ZFUlNJT05fTlVNIC8gMTAwLCBcCkBAIC00 ODEsNiArNDkyLDcgQEAgdHlwZWRlZiBzdHJ1Y3QKIAlOQU1FREFUQUxFTiwgXAogCUZMT0FU OFBBU1NCWVZBTCwgXAogCUZNR1JfQUJJX0VYVFJBLCBcCisJe19fVkFfQVJHU19ffSwgXAog fQogCiBTdGF0aWNBc3NlcnREZWNsKHNpemVvZihGTUdSX0FCSV9FWFRSQSkgPD0gc2l6ZW9m KCgoUGdfbWFnaWNfc3RydWN0ICopIDApLT5hYmlfZXh0cmEpLApAQCAtNTAwLDExICs1MTIs MjEgQEAgZXh0ZXJuIFBHRExMRVhQT1JUIGNvbnN0IFBnX21hZ2ljX3N0cnVjdCAqUEdfTUFH SUNfRlVOQ1RJT05fTkFNRSh2b2lkKTsgXAogY29uc3QgUGdfbWFnaWNfc3RydWN0ICogXAog UEdfTUFHSUNfRlVOQ1RJT05fTkFNRSh2b2lkKSBcCiB7IFwKLQlzdGF0aWMgY29uc3QgUGdf bWFnaWNfc3RydWN0IFBnX21hZ2ljX2RhdGEgPSBQR19NT0RVTEVfTUFHSUNfREFUQTsgXAor CXN0YXRpYyBjb25zdCBQZ19tYWdpY19zdHJ1Y3QgUGdfbWFnaWNfZGF0YSA9IFBHX01PRFVM RV9NQUdJQ19EQVRBKDApOyBcCiAJcmV0dXJuICZQZ19tYWdpY19kYXRhOyBcCiB9IFwKIGV4 dGVybiBpbnQgbm9fc3VjaF92YXJpYWJsZQogCisjZGVmaW5lIFBHX01PRFVMRV9NQUdJQ19F WFQoLi4uKSBcCitleHRlcm4gUEdETExFWFBPUlQgY29uc3QgUGdfbWFnaWNfc3RydWN0ICpQ R19NQUdJQ19GVU5DVElPTl9OQU1FKHZvaWQpOyBcCitjb25zdCBQZ19tYWdpY19zdHJ1Y3Qg KiBcCitQR19NQUdJQ19GVU5DVElPTl9OQU1FKHZvaWQpIFwKK3sgXAorCXN0YXRpYyBjb25z dCBQZ19tYWdpY19zdHJ1Y3QgUGdfbWFnaWNfZGF0YSA9IFwKKwkJUEdfTU9EVUxFX01BR0lD X0RBVEEoX19WQV9BUkdTX18pOyBcCisJcmV0dXJuICZQZ19tYWdpY19kYXRhOyBcCit9IFwK K2V4dGVybiBpbnQgbm9fc3VjaF92YXJpYWJsZQogCiAvKi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K ICAqCQlTdXBwb3J0IHJvdXRpbmVzIGFuZCBtYWNyb3MgZm9yIGNhbGxlcnMgb2YgZm1nci1j b21wYXRpYmxlIGZ1bmN0aW9ucwotLSAKMi4zOS41Cgo= --------------2oA0ks46EUv0lHjjvXPyUXp1--