notepad: Auto-detect and remember the encoding of files when

[Alexander Scott-Johns]

they are opened.

---
 programs/notepad/dialog.c |  105 ++++++++++++++++++++++++++++++++++++++++++--
 programs/notepad/dialog.h |    1 +
 programs/notepad/main.c   |   13 +++--
 programs/notepad/main.h   |    4 +-
 4 files changed, 112 insertions(+), 11 deletions(-)

--001636c5b52bc4e71e046d34e6d1
Content-Type: text/plain; charset=US-ASCII; name="0003-notepad-detect-enc-2009-06-25.txt"
Content-Disposition: attachment; 
	filename="0003-notepad-detect-enc-2009-06-25.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fwe2wwa80

RnJvbSAzZTNjZDU2MTllNjI0MjQ5MTJiMTQ0N2UwNmRlY2NjOTk2NDQ1MWI1IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgU2NvdHQtSm9obnMgPGFsZXhhbmRlci5zY290
dC5qb2huc0Bnb29nbGVtYWlsLmNvbT4KRGF0ZTogV2VkLCAxNyBKdW4gMjAwOSAxMjoyMDo1NSAr
MDEwMApTdWJqZWN0OiBub3RlcGFkOiBBdXRvLWRldGVjdCBhbmQgcmVtZW1iZXIgdGhlIGVuY29k
aW5nIG9mIGZpbGVzIHdoZW4gdGhleSBhcmUgb3BlbmVkLgoKLS0tCiBwcm9ncmFtcy9ub3RlcGFk
L2RpYWxvZy5jIHwgIDEwNSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KystLQogcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cuaCB8ICAgIDEgKwogcHJvZ3JhbXMvbm90ZXBh
ZC9tYWluLmMgICB8ICAgMTMgKysrLS0KIHByb2dyYW1zL25vdGVwYWQvbWFpbi5oICAgfCAgICA0
ICstCiA0IGZpbGVzIGNoYW5nZWQsIDExMiBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkK
CmRpZmYgLS1naXQgYS9wcm9ncmFtcy9ub3RlcGFkL2RpYWxvZy5jIGIvcHJvZ3JhbXMvbm90ZXBh
ZC9kaWFsb2cuYwppbmRleCA5YWFjNWFiLi4xN2MzMTQ4IDEwMDY0NAotLS0gYS9wcm9ncmFtcy9u
b3RlcGFkL2RpYWxvZy5jCisrKyBiL3Byb2dyYW1zL25vdGVwYWQvZGlhbG9nLmMKQEAgLTI2NCw3
ICsyNjQsNyBAQCBCT09MIERvQ2xvc2VGaWxlKHZvaWQpCiAgICAgICAgIH0gLyogc3dpdGNoICov
CiAgICAgfSAvKiBpZiAqLwogCi0gICAgU2V0RmlsZU5hbWUoZW1wdHlfc3RyVyk7CisgICAgU2V0
RmlsZU5hbWVBbmRFbmNvZGluZyhlbXB0eV9zdHJXLCBFTkNPRElOR19BTlNJKTsKIAogICAgIFVw
ZGF0ZVdpbmRvd0NhcHRpb24oKTsKICAgICByZXR1cm4oVFJVRSk7CkBAIC0zNDAsNiArMzQwLDE3
IEBAIHZvaWQgRG9PcGVuRmlsZShMUENXU1RSIHN6RmlsZU5hbWUsIEVOQ09ESU5HIGVuYykKICAg
ICBwVGVtcFtzaXplXSA9IDA7ICAgIC8qIG1ha2Ugc3VyZSBpdCdzICAoY2hhciknXDAnLXRlcm1p
bmF0ZWQgKi8KICAgICBwVGVtcFtzaXplKzFdID0gMDsgIC8qIG1ha2Ugc3VyZSBpdCdzIChXQ0hB
UiknXDAnLXRlcm1pbmF0ZWQgKi8KIAorICAgIC8qIElmIFVURi0xNiAoQkUgb3IgTEUpIGlzIHNl
bGVjdGVkLCBhbmQgdGhlcmUgaXMgYSBVVEYtMTYgQk9NLCBvdmVycmlkZQorICAgICAqIHRoZSBz
ZWxlY3Rpb24gKGxpa2UgbmF0aXZlIE5vdGVwYWQpLgorICAgICAqLworICAgIGlmIChzaXplID49
IDIgJiYgKGVuYz09RU5DT0RJTkdfVVRGMTZMRSB8fCBlbmM9PUVOQ09ESU5HX1VURjE2QkUpKQor
ICAgIHsKKyAgICAgICAgaWYgKChCWVRFKXBUZW1wWzBdID09IDB4ZmYgJiYgKEJZVEUpcFRlbXBb
MV0gPT0gMHhmZSkKKyAgICAgICAgICAgIGVuYyA9IEVOQ09ESU5HX1VURjE2TEU7CisgICAgICAg
IGVsc2UgaWYgKChCWVRFKXBUZW1wWzBdID09IDB4ZmUgJiYgKEJZVEUpcFRlbXBbMV0gPT0gMHhm
ZikKKyAgICAgICAgICAgIGVuYyA9IEVOQ09ESU5HX1VURjE2QkU7CisgICAgfQorCiAgICAgLyog
U2V0V2luZG93VGV4dFV0ZjggYW5kIFNldFdpbmRvd1RleHRBIHRyeSB0byBhbGxvY2F0ZSBtZW1v
cnksIHNvIHdlCiAgICAgICogY2hlY2sgaWYgdGhleSBzdWNjZWVkLgogICAgICAqLwpAQCAtMzQ3
LDYgKzM1OCw5IEBAIHZvaWQgRG9PcGVuRmlsZShMUENXU1RSIHN6RmlsZU5hbWUsIEVOQ09ESU5H
IGVuYykKICAgICB7CiAgICAgY2FzZSBFTkNPRElOR19VVEYxNkJFOgogICAgICAgICBieXRlc3dh
cF93aWRlX3N0cmluZygoV0NIQVIqKSBwVGVtcCwgc2l6ZS9zaXplb2YoV0NIQVIpKTsKKyAgICAg
ICAgLyogRm9yZ2V0IHdoZXRoZXIgdGhlIGZpbGUgaXMgQkUgb3IgTEUsIGxpa2UgbmF0aXZlIE5v
dGVwYWQuICovCisgICAgICAgIGVuYyA9IEVOQ09ESU5HX1VURjE2TEU7CisKICAgICAgICAgLyog
ZmFsbCB0aHJvdWdoICovCiAKICAgICBjYXNlIEVOQ09ESU5HX1VURjE2TEU6CkBAIC0zOTIsNyAr
NDA2LDcgQEAgdm9pZCBEb09wZW5GaWxlKExQQ1dTVFIgc3pGaWxlTmFtZSwgRU5DT0RJTkcgZW5j
KQogICAgICAgICBTZW5kTWVzc2FnZVcoR2xvYmFscy5oRWRpdCwgRU1fUkVQTEFDRVNFTCwgVFJV
RSwgKExQQVJBTSlsZlcpOwogICAgIH0KIAotICAgIFNldEZpbGVOYW1lKHN6RmlsZU5hbWUpOwor
ICAgIFNldEZpbGVOYW1lQW5kRW5jb2Rpbmcoc3pGaWxlTmFtZSwgZW5jKTsKICAgICBVcGRhdGVX
aW5kb3dDYXB0aW9uKCk7CiB9CiAKQEAgLTQwOCw2ICs0MjIsNTggQEAgVk9JRCBESUFMT0dfRmls
ZU5ldyhWT0lEKQogICAgIH0KIH0KIAorc3RhdGljIGlubGluZSBFTkNPRElORyBkZXRlY3RfZW5j
b2Rpbmdfb2ZfYnVmZmVyKGNvbnN0IHZvaWQqIGJ1ZmZlciwgaW50IGxlbikKK3sKKyAgICBzdGF0
aWMgY29uc3QgY2hhciBib21fdXRmOFtdID0geyAweGVmLCAweGJiLCAweGJmIH07CisgICAgaWYg
KGxlbiA+PSBzaXplb2YoYm9tX3V0ZjgpICYmICFtZW1jbXAoYnVmZmVyLCBib21fdXRmOCwgc2l6
ZW9mKGJvbV91dGY4KSkpCisgICAgICAgIHJldHVybiBFTkNPRElOR19VVEY4OworICAgIGVsc2UK
KyAgICB7CisgICAgICAgIGludCBmbGFncyA9IElTX1RFWFRfVU5JQ09ERV9TSUdOQVRVUkUgfAor
ICAgICAgICAgICAgICAgICAgICBJU19URVhUX1VOSUNPREVfUkVWRVJTRV9TSUdOQVRVUkUgfAor
ICAgICAgICAgICAgICAgICAgICBJU19URVhUX1VOSUNPREVfT0REX0xFTkdUSDsKKyAgICAgICAg
SXNUZXh0VW5pY29kZShidWZmZXIsIGxlbiwgJmZsYWdzKTsKKyAgICAgICAgaWYgKGZsYWdzICYg
SVNfVEVYVF9VTklDT0RFX1NJR05BVFVSRSkKKyAgICAgICAgICAgIHJldHVybiBFTkNPRElOR19V
VEYxNkxFOworICAgICAgICBlbHNlIGlmIChmbGFncyAmIElTX1RFWFRfVU5JQ09ERV9SRVZFUlNF
X1NJR05BVFVSRSkKKyAgICAgICAgICAgIHJldHVybiBFTkNPRElOR19VVEYxNkJFOworICAgICAg
ICBlbHNlCisgICAgICAgICAgICByZXR1cm4gRU5DT0RJTkdfQU5TSTsKKyAgICB9Cit9CisKKy8q
IFVzZWQgdG8gZGV0ZWN0IGVuY29kaW5nIG9mIGZpbGVzIHNlbGVjdGVkIGluIE9wZW4gZGlhbG9n
LCBhbmQgd2hlbgorICogb3BlbmluZyBmaWxlcyB3aXRob3V0IHVzaW5nIE9wZW4gZGlhbG9nLgor
ICoKKyAqIFJldHVybnMgRU5DT0RJTkdfSU5WQUxJRCBpZiBmaWxlIGNhbid0IGJlIHJlYWQsIGV0
Yy4KKyAqLworRU5DT0RJTkcgRGV0ZWN0RW5jb2RpbmdPZkZpbGUoTFBDV1NUUiBzekZpbGVOYW1l
KQoreworICAgIERXT1JEIHNpemU7CisgICAgSEFORExFIGhGaWxlID0gQ3JlYXRlRmlsZVcoc3pG
aWxlTmFtZSwgR0VORVJJQ19SRUFELCBGSUxFX1NIQVJFX1JFQUQsIE5VTEwsCisgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgT1BFTl9FWElTVElORywgRklMRV9BVFRSSUJVVEVfTk9STUFM
LCBOVUxMKTsKKyAgICBpZiAoaEZpbGUgPT0gSU5WQUxJRF9IQU5ETEVfVkFMVUUpCisgICAgICAg
IHJldHVybiBFTkNPRElOR19JTlZBTElEOworICAgIHNpemUgPSBHZXRGaWxlU2l6ZShoRmlsZSwg
TlVMTCk7CisgICAgaWYgKHNpemUgPT0gSU5WQUxJRF9GSUxFX1NJWkUpCisgICAgeworICAgICAg
ICBDbG9zZUhhbmRsZShoRmlsZSk7CisgICAgICAgIHJldHVybiBFTkNPRElOR19JTlZBTElEOwor
ICAgIH0KKyAgICBlbHNlCisgICAgeworICAgICAgICBEV09SRCBkd051bVJlYWQ7CisgICAgICAg
IEJZVEUgYnVmZmVyW01BWF9TVFJJTkdfTEVOXTsKKyAgICAgICAgaWYgKCFSZWFkRmlsZShoRmls
ZSwgYnVmZmVyLCBtaW4oc2l6ZSwgc2l6ZW9mKGJ1ZmZlcikpLCAmZHdOdW1SZWFkLCBOVUxMKSkK
KyAgICAgICAgeworICAgICAgICAgICAgQ2xvc2VIYW5kbGUoaEZpbGUpOworICAgICAgICAgICAg
cmV0dXJuIEVOQ09ESU5HX0lOVkFMSUQ7CisgICAgICAgIH0KKyAgICAgICAgQ2xvc2VIYW5kbGUo
aEZpbGUpOworICAgICAgICByZXR1cm4gZGV0ZWN0X2VuY29kaW5nX29mX2J1ZmZlcihidWZmZXIs
IGR3TnVtUmVhZCk7CisgICAgfQorfQorCiBzdGF0aWMgVUlOVF9QVFIgQ0FMTEJBQ0sgT2ZuSG9v
a1Byb2MoSFdORCBoZGxnLCBVSU5UIHVNc2csIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0p
CiB7CiAgICAgc3RhdGljIEhXTkQgaEVuY0NvbWJvOwpAQCAtNDM1LDYgKzUwMSwzMiBAQCBzdGF0
aWMgVUlOVF9QVFIgQ0FMTEJBQ0sgT2ZuSG9va1Byb2MoSFdORCBoZGxnLCBVSU5UIHVNc2csIFdQ
QVJBTSB3UGFyYW0sIExQQVJBTQogICAgICAgICAgICAgaW50IGluZGV4ID0gU2VuZE1lc3NhZ2VX
KGhFbmNDb21ibywgQ0JfR0VUQ1VSU0VMLCAwLCAwKTsKICAgICAgICAgICAgIEdsb2JhbHMuZW5j
T2ZuQ29tYm8gPSBpbmRleD09Q0JfRVJSID8gRU5DT0RJTkdfQU5TSSA6IChFTkNPRElORylpbmRl
eDsKICAgICAgICAgfQorCisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBXTV9OT1RJRlk6Cisg
ICAgICAgIHN3aXRjaCAoKChPRk5PVElGWVcqKWxQYXJhbSktPmhkci5jb2RlKQorICAgICAgICB7
CisgICAgICAgICAgICBjYXNlIENETl9TRUxDSEFOR0U6CisgICAgICAgICAgICAgICAgaWYgKEds
b2JhbHMuYk9mbklzT3BlbkRpYWxvZykKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg
ICAgICAgIC8qIENoZWNrIHRoZSBzdGFydCBvZiB0aGUgc2VsZWN0ZWQgZmlsZSBmb3IgYSBCT00u
ICovCisgICAgICAgICAgICAgICAgICAgIEVOQ09ESU5HIGVuYzsKKyAgICAgICAgICAgICAgICAg
ICAgV0NIQVIgc3pGaWxlTmFtZVtNQVhfUEFUSF07CisgICAgICAgICAgICAgICAgICAgIFNlbmRN
ZXNzYWdlVyhHZXRQYXJlbnQoaGRsZyksIENETV9HRVRGSUxFUEFUSCwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUoc3pGaWxlTmFtZSksIChMUEFSQU0pc3pGaWxl
TmFtZSk7CisgICAgICAgICAgICAgICAgICAgIGVuYyA9IERldGVjdEVuY29kaW5nT2ZGaWxlKHN6
RmlsZU5hbWUpOworICAgICAgICAgICAgICAgICAgICBpZiAoZW5jICE9IEVOQ09ESU5HX0lOVkFM
SUQpCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIEdsb2Jh
bHMuZW5jT2ZuQ29tYm8gPSBlbmM7CisgICAgICAgICAgICAgICAgICAgICAgICBTZW5kTWVzc2Fn
ZVcoaEVuY0NvbWJvLCBDQl9TRVRDVVJTRUwsIChXUEFSQU0pZW5jLCAwKTsKKyAgICAgICAgICAg
ICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBicmVhazsKKwor
ICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQog
ICAgICAgICBicmVhazsKIAogICAgIGRlZmF1bHQ6CkBAIC00NzEsNiArNTYzLDcgQEAgVk9JRCBE
SUFMT0dfRmlsZU9wZW4oVk9JRCkKICAgICBvcGVuZmlsZW5hbWUubHBzdHJEZWZFeHQgICAgICAg
PSBzekRlZmF1bHRFeHQ7CiAKICAgICBHbG9iYWxzLmVuY09mbkNvbWJvID0gRU5DT0RJTkdfQU5T
STsKKyAgICBHbG9iYWxzLmJPZm5Jc09wZW5EaWFsb2cgPSBUUlVFOwogCiAgICAgaWYgKEdldE9w
ZW5GaWxlTmFtZVcoJm9wZW5maWxlbmFtZSkpCiAgICAgICAgIERvT3BlbkZpbGUob3BlbmZpbGVu
YW1lLmxwc3RyRmlsZSwgR2xvYmFscy5lbmNPZm5Db21ibyk7CkBAIC00ODIsNyArNTc1LDcgQEAg
Qk9PTCBESUFMT0dfRmlsZVNhdmUoVk9JRCkKICAgICBpZiAoR2xvYmFscy5zekZpbGVOYW1lWzBd
ID09ICdcMCcpCiAgICAgICAgIHJldHVybiBESUFMT0dfRmlsZVNhdmVBcygpOwogICAgIGVsc2UK
LSAgICAgICAgRG9TYXZlRmlsZShHbG9iYWxzLnN6RmlsZU5hbWUsIEVOQ09ESU5HX0FOU0kpOwor
ICAgICAgICBEb1NhdmVGaWxlKEdsb2JhbHMuc3pGaWxlTmFtZSwgR2xvYmFscy5lbmNGaWxlKTsK
ICAgICByZXR1cm4gVFJVRTsKIH0KIApAQCAtNTEzLDEwICs2MDYsMTIgQEAgQk9PTCBESUFMT0df
RmlsZVNhdmVBcyhWT0lEKQogICAgIHNhdmVhcy5scFRlbXBsYXRlTmFtZSAgICA9IE1BS0VJTlRS
RVNPVVJDRVcoSUREX09GTl9URU1QTEFURSk7CiAgICAgc2F2ZWFzLmxwc3RyRGVmRXh0ICAgICAg
ID0gc3pEZWZhdWx0RXh0OwogCi0gICAgR2xvYmFscy5lbmNPZm5Db21ibyA9IEVOQ09ESU5HX0FO
U0k7CisgICAgLyogUHJlc2V0IGVuY29kaW5nIHRvIHdoYXQgZmlsZSB3YXMgb3BlbmVkL3NhdmVk
IGxhc3Qgd2l0aC4gKi8KKyAgICBHbG9iYWxzLmVuY09mbkNvbWJvID0gR2xvYmFscy5lbmNGaWxl
OworICAgIEdsb2JhbHMuYk9mbklzT3BlbkRpYWxvZyA9IEZBTFNFOwogCiAgICAgaWYgKEdldFNh
dmVGaWxlTmFtZVcoJnNhdmVhcykpIHsKLSAgICAgICAgU2V0RmlsZU5hbWUoc3pQYXRoKTsKKyAg
ICAgICAgU2V0RmlsZU5hbWVBbmRFbmNvZGluZyhzelBhdGgsIEdsb2JhbHMuZW5jT2ZuQ29tYm8p
OwogICAgICAgICBVcGRhdGVXaW5kb3dDYXB0aW9uKCk7CiAgICAgICAgIERvU2F2ZUZpbGUoc3pQ
YXRoLCBHbG9iYWxzLmVuY09mbkNvbWJvKTsKICAgICAgICAgcmV0dXJuIFRSVUU7CmRpZmYgLS1n
aXQgYS9wcm9ncmFtcy9ub3RlcGFkL2RpYWxvZy5oIGIvcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cu
aAppbmRleCA3YWFiYjZlLi4xYTIzNWU4IDEwMDY0NAotLS0gYS9wcm9ncmFtcy9ub3RlcGFkL2Rp
YWxvZy5oCisrKyBiL3Byb2dyYW1zL25vdGVwYWQvZGlhbG9nLmgKQEAgLTU0LDQgKzU0LDUgQEAg
aW50IERJQUxPR19TdHJpbmdNc2dCb3goSFdORCBoUGFyZW50LCBpbnQgZm9ybWF0SWQsIExQQ1dT
VFIgc3pTdHJpbmcsIERXT1JEIGR3RmwKIFZPSUQgU2hvd0xhc3RFcnJvcih2b2lkKTsKIEJPT0wg
RmlsZUV4aXN0cyhMUENXU1RSIHN6RmlsZW5hbWUpOwogQk9PTCBEb0Nsb3NlRmlsZSh2b2lkKTsK
K0VOQ09ESU5HIERldGVjdEVuY29kaW5nT2ZGaWxlKExQQ1dTVFIgc3pGaWxlTmFtZSk7CiB2b2lk
IERvT3BlbkZpbGUoTFBDV1NUUiBzekZpbGVOYW1lLCBFTkNPRElORyBlbmMpOwpkaWZmIC0tZ2l0
IGEvcHJvZ3JhbXMvbm90ZXBhZC9tYWluLmMgYi9wcm9ncmFtcy9ub3RlcGFkL21haW4uYwppbmRl
eCBhOWI1ZjgzLi43M2U3ZGNkIDEwMDY0NAotLS0gYS9wcm9ncmFtcy9ub3RlcGFkL21haW4uYwor
KysgYi9wcm9ncmFtcy9ub3RlcGFkL21haW4uYwpAQCAtNjQsMTUgKzY0LDE4IEBAIHN0YXRpYyBj
b25zdCBXQ0hBUiB2YWx1ZV9zekZvb3RlcltdICAgICAgICAgPSB7J3MnLCd6JywnVCcsJ3InLCdh
JywnaScsJ2wnLCdlJywnCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogICoKLSAqICAgICAgICAgICBTZXRG
aWxlTmFtZQorICogICAgICAgICAgIFNldEZpbGVOYW1lQW5kRW5jb2RpbmcKICAqCi0gKiAgU2V0
cyBHbG9iYWwgRmlsZSBOYW1lLgorICogIFNldHMgZ2xvYmFsIGZpbGUgbmFtZSBhbmQgZW5jb2Rp
bmcgKHdoaWNoIGlzIHVzZWQgdG8gcHJlc2VsZWN0IG9yaWdpbmFsCisgKiAgZW5jb2RpbmcgaW4g
U2F2ZSBBcyBkaWFsb2csIGFuZCB3aGVuIHNhdmluZyB3aXRob3V0IHVzaW5nIHRoZSBTYXZlIEFz
CisgKiAgZGlhbG9nKS4KICAqLwotVk9JRCBTZXRGaWxlTmFtZShMUENXU1RSIHN6RmlsZU5hbWUp
CitWT0lEIFNldEZpbGVOYW1lQW5kRW5jb2RpbmcoTFBDV1NUUiBzekZpbGVOYW1lLCBFTkNPRElO
RyBlbmMpCiB7CiAgICAgbHN0cmNweVcoR2xvYmFscy5zekZpbGVOYW1lLCBzekZpbGVOYW1lKTsK
ICAgICBHbG9iYWxzLnN6RmlsZVRpdGxlWzBdID0gMDsKICAgICBHZXRGaWxlVGl0bGVXKHN6Rmls
ZU5hbWUsIEdsb2JhbHMuc3pGaWxlVGl0bGUsIHNpemVvZihHbG9iYWxzLnN6RmlsZVRpdGxlKSk7
CisgICAgR2xvYmFscy5lbmNGaWxlID0gZW5jOwogfQogCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
CkBAIC01NzgsNyArNTgxLDcgQEAgc3RhdGljIExSRVNVTFQgV0lOQVBJIE5PVEVQQURfV25kUHJv
YyhIV05EIGhXbmQsIFVJTlQgbXNnLCBXUEFSQU0gd1BhcmFtLAogCiAgICAgICAgIERyYWdRdWVy
eUZpbGVXKGhEcm9wLCAwLCBzekZpbGVOYW1lLCBBUlJBWV9TSVpFKHN6RmlsZU5hbWUpKTsKICAg
ICAgICAgRHJhZ0ZpbmlzaChoRHJvcCk7Ci0gICAgICAgIERvT3BlbkZpbGUoc3pGaWxlTmFtZSwg
RU5DT0RJTkdfQU5TSSk7CisgICAgICAgIERvT3BlbkZpbGUoc3pGaWxlTmFtZSwgRGV0ZWN0RW5j
b2RpbmdPZkZpbGUoc3pGaWxlTmFtZSkpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgCkBA
IC02ODksNyArNjkyLDcgQEAgc3RhdGljIHZvaWQgSGFuZGxlQ29tbWFuZExpbmUoTFBXU1RSIGNt
ZGxpbmUpCiAKICAgICAgICAgaWYgKGZpbGVfZXhpc3RzKQogICAgICAgICB7Ci0gICAgICAgICAg
ICBEb09wZW5GaWxlKGZpbGVfbmFtZSwgRU5DT0RJTkdfQU5TSSk7CisgICAgICAgICAgICBEb09w
ZW5GaWxlKGZpbGVfbmFtZSwgRGV0ZWN0RW5jb2RpbmdPZkZpbGUoZmlsZV9uYW1lKSk7CiAgICAg
ICAgICAgICBJbnZhbGlkYXRlUmVjdChHbG9iYWxzLmhNYWluV25kLCBOVUxMLCBGQUxTRSk7CiAg
ICAgICAgICAgICBpZiAob3B0X3ByaW50KQogICAgICAgICAgICAgICAgIERJQUxPR19GaWxlUHJp
bnQoKTsKZGlmZiAtLWdpdCBhL3Byb2dyYW1zL25vdGVwYWQvbWFpbi5oIGIvcHJvZ3JhbXMvbm90
ZXBhZC9tYWluLmgKaW5kZXggYzQ4NWU3Yi4uNmU2NzI3MiAxMDA2NDQKLS0tIGEvcHJvZ3JhbXMv
bm90ZXBhZC9tYWluLmgKKysrIGIvcHJvZ3JhbXMvbm90ZXBhZC9tYWluLmgKQEAgLTUxLDggKzUx
LDEwIEBAIHR5cGVkZWYgc3RydWN0CiAgIFdDSEFSICAgIHN6UmVwbGFjZVRleHRbTUFYX1BBVEhd
OwogICBXQ0hBUiAgICBzekZpbGVOYW1lW01BWF9QQVRIXTsKICAgV0NIQVIgICAgc3pGaWxlVGl0
bGVbTUFYX1BBVEhdOworICBFTkNPRElORyBlbmNGaWxlOwogICBXQ0hBUiAgICBzekZpbHRlclsy
ICogTUFYX1NUUklOR19MRU4gKyAxMDBdOwogICBFTkNPRElORyBlbmNPZm5Db21ibzsgIC8qIEVu
Y29kaW5nIHNlbGVjdGVkIGluIElEQ19PRk5fRU5DQ09NQk8gKi8KKyAgQk9PTCAgICAgYk9mbklz
T3BlbkRpYWxvZzsKICAgSU5UICAgICAgaU1hcmdpblRvcDsKICAgSU5UICAgICAgaU1hcmdpbkJv
dHRvbTsKICAgSU5UICAgICAgaU1hcmdpbkxlZnQ7CkBAIC02OCw2ICs3MCw2IEBAIHR5cGVkZWYg
c3RydWN0CiAKIGV4dGVybiBOT1RFUEFEX0dMT0JBTFMgR2xvYmFsczsKIAotVk9JRCBTZXRGaWxl
TmFtZShMUENXU1RSIHN6RmlsZU5hbWUpOworVk9JRCBTZXRGaWxlTmFtZUFuZEVuY29kaW5nKExQ
Q1dTVFIgc3pGaWxlTmFtZSwgRU5DT0RJTkcgZW5jKTsKIHZvaWQgTk9URVBBRF9Eb0ZpbmQoRklO
RFJFUExBQ0VXICpmcik7CiBEV09SRCBnZXRfZHBpKHZvaWQpOwotLSAKMS41LjYuMwoK
--001636c5b52bc4e71e046d34e6d1--