MIME-Version: 1.0
References: <87a6shyenl.fsf@gmail.com>
 <CA+OCxoxsk-VJOJvw95V+pDN0G79T5-F1jAHB-THsPZd10f0KRg@mail.gmail.com>
 <CACCA4P0PG8y_u9vDwTTL4AHbXOfP1k7joLY4tjLQ40DNpWgyoA@mail.gmail.com>
 <CACCA4P3JvfMmG_LCm8Oeqnp4r=EuJBLuaS2mUieuw+--2ybgFQ@mail.gmail.com>
 <CACCA4P1NgUGZO8PSC6_Js+__pqALrSkd-NGCGWr_OtYptGoqEA@mail.gmail.com>
 <874ki1yais.fsf@gmail.com> <87zgztwv30.fsf@gmail.com>
In-Reply-To: <87zgztwv30.fsf@gmail.com>
From: Neel Patel <neel.patel@enterprisedb.com>
Date: Wed, 24 Feb 2021 17:53:08 +0530
Message-ID: 
 <CACCA4P0CnEe1+_yq4brdNKFHuL+HP0em+S2tfbLWcnEDPFNbfw@mail.gmail.com>
Subject: Re: pgagent unicode support
To: Sergey Burladyan <eshkinkot@gmail.com>
Cc: pgadmin-hackers <pgadmin-hackers@postgresql.org>,
	Ashesh Vashi <ashesh.vashi@enterprisedb.com>, Dave Page <dpage@pgadmin.org>
Content-Type: multipart/mixed; boundary="000000000000a3d5e005bc1419bf"
Precedence: bulk

--000000000000a3d5e005bc1419bf
Content-Type: multipart/alternative; boundary="000000000000a3d5de05bc1419bd"

--000000000000a3d5de05bc1419bd
Content-Type: text/plain; charset="UTF-8"

Hi Sergey,

Thanks for the review. Please find the attached updated patch.
Do review it and let me know in case of any comments.

Thanks,
Neel Patel

On Wed, Feb 24, 2021 at 5:12 PM Sergey Burladyan <eshkinkot@gmail.com>
wrote:

> Sergey Burladyan <eshkinkot@gmail.com> writes:
>
> > Maybe it should look something like this:
> > +        wcstombs_s(&charsConverted, mbs, mb_len + 1, wchar_str, mb_len);
>
> Ah, and we missed check for error.
>
> Something like this, maybe:
> +#ifdef __WIN32__
> +        size_t charsConverted = 0;
> +        if (wcstombs_s(&charsConverted, mbs, mb_len + 1, wchar_str,
> mb_len) != 0) {
> +                delete [] mbs;
> +                return NULL;
> +        }
> +#else
>
> --
> Sergey Burladyan
>

--000000000000a3d5de05bc1419bd
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi Sergey,<div><br></div><div>Thanks for the review. Pleas=
e find the attached updated patch.</div><div>Do review it and let me know i=
n case of any comments.</div><div><br></div><div>Thanks,</div><div>Neel Pat=
el</div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmai=
l_attr">On Wed, Feb 24, 2021 at 5:12 PM Sergey Burladyan &lt;<a href=3D"mai=
lto:eshkinkot@gmail.com">eshkinkot@gmail.com</a>&gt; wrote:<br></div><block=
quote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1=
px solid rgb(204,204,204);padding-left:1ex">Sergey Burladyan &lt;<a href=3D=
"mailto:eshkinkot@gmail.com" target=3D"_blank">eshkinkot@gmail.com</a>&gt; =
writes:<br>
<br>
&gt; Maybe it should look something like this:<br>
&gt; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 wcstombs_s(&amp;charsConverted, mbs, mb_l=
en + 1, wchar_str, mb_len);<br>
<br>
Ah, and we missed check for error.<br>
<br>
Something like this, maybe:<br>
+#ifdef __WIN32__<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 size_t charsConverted =3D 0;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (wcstombs_s(&amp;charsConverted, mbs, mb_le=
n + 1, wchar_str, mb_len) !=3D 0) {<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 delete [] mbs;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br>
+#else<br>
<br>
-- <br>
Sergey Burladyan<br>
</blockquote></div>

--000000000000a3d5de05bc1419bd--

--000000000000a3d5e005bc1419bf
Content-Type: application/octet-stream; name="pgagent_unicode_v2.patch"
Content-Disposition: attachment; filename="pgagent_unicode_v2.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kljerr450>
X-Attachment-Id: f_kljerr450

ZGlmZiAtLWdpdCBhL21pc2MuY3BwIGIvbWlzYy5jcHAKaW5kZXggMzVhYzgzZC4uZTUxOGYzYSAx
MDA2NDQKLS0tIGEvbWlzYy5jcHAKKysrIGIvbWlzYy5jcHAKQEAgLTE0MywyMiArMTQzLDY2IEBA
IHN0ZDo6d3N0cmluZyBOdW1Ub1N0cihjb25zdCBsb25nIGwpCiB9CiAKIC8vIFRoaXMgZnVuY3Rp
b24gaXMgdXNlZCB0byBjb252ZXJ0IGNoYXIqIHRvIHN0ZDo6d3N0cmluZy4KLXN0ZDo6d3N0cmlu
ZyBDaGFyVG9XU3RyaW5nKGNvbnN0IGNoYXIqIGNzdHIpCitzdGQ6OndzdHJpbmcgQ2hhclRvV1N0
cmluZyhjb25zdCBjaGFyICpjc3RyKQogewotCXN0ZDo6c3RyaW5nIHMgPSBzdGQ6OnN0cmluZyhj
c3RyKTsKLQlzdGQ6OndzdHJpbmcgd3NUbXAocy5iZWdpbigpLCBzLmVuZCgpKTsKLQlyZXR1cm4g
d3NUbXA7CisJaWYgKGNzdHIgIT0gTlVMTCkKKwl7CisJCXNpemVfdCB3Y19jbnQgPSBtYnN0b3dj
cyhOVUxMLCBjc3RyLCAwKTsKKworCQlpZiAod2NfY250ID09IChzaXplX3QpIC0xKSB7CisJCQly
ZXR1cm4gc3RkOjp3c3RyaW5nKCk7CisJCX0KKworCQl3Y2hhcl90ICp3Y3MgPSBuZXcgd2NoYXJf
dFt3Y19jbnQgKyAxXTsKKwkJaWYgKHdjcyA9PSBOVUxMKSB7CisJCQlyZXR1cm4gc3RkOjp3c3Ry
aW5nKCk7CisJCX0KKworCQlpZiAobWJzdG93Y3Mod2NzLCBjc3RyLCB3Y19jbnQgKyAxKSA9PSAo
c2l6ZV90KSAtMSkgeworCQkJZGVsZXRlIFtdIHdjczsKKwkJCXJldHVybiBzdGQ6OndzdHJpbmco
KTsKKwkJfQorCisJCXN0ZDo6d3N0cmluZyB0bXAoJndjc1swXSwgJndjc1t3Y19jbnRdKTsKKwkJ
ZGVsZXRlIFtdIHdjczsKKworCQlyZXR1cm4gdG1wOworCX0KKwlyZXR1cm4gc3RkOjp3c3RyaW5n
KCk7CiB9CiAKIC8vIFRoaXMgZnVuY3Rpb24gaXMgdXNlZCB0byBjb252ZXJ0IHN0ZDo6d3N0cmlu
ZyB0byBjaGFyICouCi1jaGFyICogV1N0cmluZ1RvQ2hhcihjb25zdCBzdGQ6OndzdHJpbmcgJndz
dHIpCitjaGFyICpXU3RyaW5nVG9DaGFyKGNvbnN0IHN0ZDo6d3N0cmluZyAmd3N0cikKIHsKIAlj
b25zdCB3Y2hhcl90ICp3Y2hhcl9zdHIgPSB3c3RyLmNfc3RyKCk7Ci0JaW50IHdzdHJfbGVuZ3Ro
ID0gd2NzbGVuKHdjaGFyX3N0cik7Ci0JY2hhciAqZHN0ID0gbmV3IGNoYXJbd3N0cl9sZW5ndGgg
KyAxMF07Ci0JbWVtc2V0KGRzdCwgMHgwMCwgKHdzdHJfbGVuZ3RoICsgMTApKTsKLQl3Y3N0b21i
cyhkc3QsIHdjaGFyX3N0ciwgd3N0cl9sZW5ndGgpOwotCXJldHVybiBkc3Q7CisKKwlpbnQgbWJf
bGVuID0gd2NzdG9tYnMoTlVMTCwgd2NoYXJfc3RyLCAwKTsKKworCWlmICgoc2l6ZV90KW1iX2xl
biA9PSAoc2l6ZV90KSAtMSkgeworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwljaGFyICptYnMgPSBu
ZXcgY2hhclttYl9sZW4gKyAxXTsKKwlpZiAobWJzID09IE5VTEwpIHsKKwkJcmV0dXJuIE5VTEw7
CisJfQorCisJbWVtc2V0KG1icywgMCwgbWJfbGVuICsgMSk7CisKKyNpZmRlZiBfX1dJTjMyX18K
KwlzaXplX3QgY2hhcnNDb252ZXJ0ZWQgPSAwOworCWlmICh3Y3N0b21ic19zKCZjaGFyc0NvbnZl
cnRlZCwgbWJzLCBtYl9sZW4gKyAxLCB3Y2hhcl9zdHIsIG1iX2xlbikgIT0gMCkgeworCQlkZWxl
dGUgW10gbWJzOworCQlyZXR1cm4gTlVMTDsKKwl9CisjZWxzZQorCWlmICh3Y3N0b21icyhtYnMs
IHdjaGFyX3N0ciwgbWJfbGVuICsgMSkgPT0gKHNpemVfdCkgLTEpIHsKKwkJZGVsZXRlIFtdIG1i
czsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisjZW5kaWYKKwlyZXR1cm4gbWJzOwogfQogCiAvLyBC
ZWxvdyBmdW5jdGlvbiB3aWxsIGdlbmVyYXRlIHJhbmRvbSBzdHJpbmcgb2YgZ2l2ZW4gY2hhcmFj
dGVyLgpkaWZmIC0tZ2l0IGEvdW5peC5jcHAgYi91bml4LmNwcAppbmRleCA5YTQxZTM4Li5kNGIw
ZDNkIDEwMDY0NAotLS0gYS91bml4LmNwcAorKysgYi91bml4LmNwcApAQCAtMTU1LDYgKzE1NSw4
IEBAIHN0YXRpYyB2b2lkIGRhZW1vbml6ZSh2b2lkKQogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hh
ciAqKmFyZ3YpCiB7CisJc2V0bG9jYWxlKExDX0FMTCwgIiIpOworCiAJc3RkOjp3c3RyaW5nIGV4
ZWN1dGFibGU7CiAJZXhlY3V0YWJsZS5hc3NpZ24oQ2hhclRvV1N0cmluZyhhcmd2WzBdKSk7CiAK
--000000000000a3d5e005bc1419bf--