[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On 7/29/05, Evert Glebbeek <eglebbk@xxxxxxxxxx> wrote:
> On Wednesday 27 July 2005 03:35, Grady Martin wrote:
>
> > Also, I would like to propose some changes to the alert messages of
> > the grabber. First, both "Nothing to <verb>!" and "Can't <verb> a
> > multiple selection!" could become "Please select a single item to
> > <verb>." This not only eliminates the need to branch on those two
> > conditions but is also less harsh and doesn't hurt my brain
> > ("Multiple" is not an adjective!).
>=20
> Sounds reasonable to me, except that `Please select a single item' sounds=
a
> bit weird for me when you haven't selected anything. Too pedantic, in som=
e
> way.
>=20
> > In addition, the grabber has some
> > non-standard dialogs, such as "Yes/Cancel" (as opposed "OK/Cancel" or
> > "Yes/No"). Should I take the liberty of making changes of this
> > nature? If you approve, I will happily respond with the final grabber
> > patch for now.
>=20
> Yes, I think this is good too. But make it a seperate patch so that they
> can be commited one after the other or independently.
> It's good form to seperate cosmetic patches from functional ones in the C=
VS
> tree, or at least I think so. :)
>=20
For the first problem, I followed Evert's line of thinking and changed
the alerts to "Please make a valid selection." and "Please choose one
item." I am a bit worried about the acceptance of this patch, though,
because on paper it doesn't look like much of an improvement. But the
new messages are quick and concise, while being descriptive enough for
their purposes. Compared to the old messages, these make editing
datafiles seem more fluid.
The standard dialogs patch is basically a shoo-in.
And attached is a third patch for the location of "grabber.txt".=20
Apparently, not many people actually use the grabber's help system,
but it doesn't matter now; the fix is simple.
Oh, and one of the patches contains an unrelated comment to assist
future contributors. Also note that the alerts patch overlaps the
move command patch from a few days ago, so a hunk or two might fail if
that patch hasn't been committed yet.
Thanks for your time.
- Grady
------=_Part_11345_5257705.1122798955226
Content-Type: application/octet-stream; name="grabber.c.buttons.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="grabber.c.buttons.diff"
LS0tIGdyYWJiZXIuYwkyMDA1LTA3LTMwIDE4OjIzOjM2LjAwMDAwMDAwMCArMDAwMA0KKysrIGdy
YWJiZXIuYy5idXR0b25zCTIwMDUtMDctMzAgMTg6MTM6MzQuMDAwMDAwMDAwICswMDAwDQpAQCAt
MjMyLDYgKzIzMiw3IEBADQogDQogDQogDQorLyogIE5vdGU6ICBTZWUgRExHXyogY29uc3RhbnRz
IGJlbG93LiAqLw0KIHN0YXRpYyBESUFMT0cgbWFpbl9kbGdbXSA9DQogew0KICAgIC8qIChkaWFs
b2cgcHJvYykgICAgICh4KSAgICh5KSAgICh3KSAgIChoKSAgIChmZykgIChiZykgIChrZXkpICAg
IChmbGFncykgICAgIChkMSkgICAgICAgICAgIChkMikgICAgIChkcCkgICAgICAgICAgICAgIChk
cDIpIChkcDMpICovDQpAQCAtMTk0MCw2ICsxOTQxLDE2IEBADQogDQogDQogDQorLyogaGVscGVy
IGZvciBjbG9zaW5nIG1vZGlmaWVkIGZpbGVzICovDQorc3RhdGljIGludCBhc2tfc2F2ZV9jaGFu
Z2VzKHZvaWQpDQorew0KKyAgIHJldHVybiBhbGVydDMoIlNhdmUgY2hhbmdlcyB0byBkYXRhZmls
ZT8iLA0KKwkJIE5VTEwsIE5VTEwsDQorCQkgIlllcyIsICJObyIsICJDYW5jZWwiLCAneScsICdu
JywgMjcpOw0KK30NCisNCisNCisNCiAvKiBoYW5kbGUgdGhlIGxvYWQgY29tbWFuZCAqLw0KIHN0
YXRpYyBpbnQgbG9hZGVyKHZvaWQpDQogew0KQEAgLTE5NTIsOSArMTk2Myw3IEBADQogDQogICAg
aWYgKGZpbGVfc2VsZWN0X2V4KCJMb2FkIGRhdGFmaWxlIiwgYnVmLCAiZGF0Iiwgc2l6ZW9mKGJ1
ZiksIDAsIDApKSB7DQogICAgICAgaWYgKGlzX21vZGlmaWVkKSB7DQotCSBpbnQgciA9IGFsZXJ0
MygiUHJldmlvdXMgZGF0YSBtYXkgaGF2ZSBiZWVuIG1vZGlmaWVkLiIsDQotCQkJIkRvIHlvdSB3
YW50IHRvIHNhdmUgdGhlbT8iLCBOVUxMLA0KLQkJCSJTYXZlIiwgIkRvIG5vdCBzYXZlIiwgIkNh
bmNlbCIsICdzJywgJ2QnLCAyNyk7DQorCSBpbnQgciA9IGFza19zYXZlX2NoYW5nZXMoKTsNCiAN
CiAJIHN3aXRjaCAocikgew0KIA0KQEAgLTE5ODYsOSArMTk5NSw3IEBADQogICAgQ0hFQ0tfTUVO
VV9IT09LKCJOZXciLCBEQVRFRElUX01FTlVfRklMRSk7DQogDQogICAgaWYgKGlzX21vZGlmaWVk
KSB7DQotICAgICAgaW50IHIgPSBhbGVydDMoIlByZXZpb3VzIGRhdGEgbWF5IGhhdmUgYmVlbiBt
b2RpZmllZC4iLA0KLQkJICAgICAiRG8geW91IHdhbnQgdG8gc2F2ZSB0aGVtPyIsIE5VTEwsDQot
CQkgICAgICJTYXZlIiwgIkRvIG5vdCBzYXZlIiwgIkNhbmNlbCIsICdzJywgJ2QnLCAyNyk7DQor
ICAgICAgaW50IHIgPSBhc2tfc2F2ZV9jaGFuZ2VzKCk7DQogDQogICAgICAgc3dpdGNoIChyKSB7
DQogDQpAQCAtMjA0NCw3ICsyMDUxLDcgQEANCiAgICBpZiAoZmlsZV9zZWxlY3RfZXgoIlNhdmUg
ZGF0YWZpbGUiLCBidWYsICJkYXQiLCBzaXplb2YoYnVmKSwgMCwgMCkpIHsNCiAgICAgICBpZiAo
KHN0cmljbXAoZ3JhYmJlcl9kYXRhX2ZpbGUsIGJ1ZikgIT0gMCkgJiYgKGV4aXN0cyhidWYpKSkg
ew0KIAkgc3ByaW50ZihidWYyLCAiJXMgYWxyZWFkeSBleGlzdHMsIG92ZXJ3cml0ZT8iLCBidWYp
Ow0KLQkgaWYgKGFsZXJ0KGJ1ZjIsIE5VTEwsIE5VTEwsICJZZXMiLCAiQ2FuY2VsIiwgJ3knLCAy
NykgIT0gMSkNCisJIGlmIChhbGVydChidWYyLCBOVUxMLCBOVUxMLCAiWWVzIiwgIk5vIiwgJ3kn
LCAnbicpICE9IDEpDQogCSAgICByZXR1cm4gRF9SRURSQVc7DQogICAgICAgfQ0KIA0KQEAgLTIz
NzYsOSArMjM4Myw3IEBADQogICAgaWYgKCFpc19tb2RpZmllZCkNCiAgICAgICByZXR1cm4gRF9D
TE9TRTsNCiANCi0gICByID0gYWxlcnQzKCJEYXRhIG1heSBoYXZlIGJlZW4gbW9kaWZpZWQuIiwN
Ci0JICAgICAgIkRvIHlvdSB3YW50IHRvIHNhdmUgYmVmb3JlIHF1aXR0aW5nPyIsIE5VTEwsDQot
CSAgICAgICJTYXZlIiwgIkRvIG5vdCBzYXZlIiwgIkNhbmNlbCIsICdzJywgJ2QnLCAyNyk7DQor
ICAgciA9IGFza19zYXZlX2NoYW5nZXMoKTsNCiANCiAgICBpZiAociA9PSAyKQ0KICAgICAgIHJl
dHVybiBEX0NMT1NFOw0KQEAgLTI1NzQsNyArMjU3OSw3IEBADQogICAgZWxzZQ0KICAgICAgIHNw
cmludGYoYnVmLCAidGhlc2UgJWQgaXRlbXM/IiwgdG9kZWxfY291bnQpOw0KIA0KLSAgIGlmIChh
bGVydCgiUmVhbGx5IGRlbGV0ZSIsIGJ1ZiwgTlVMTCwgIlllcyIsICJDYW5jZWwiLCAneScsIDI3
KSAhPSAxKQ0KKyAgIGlmIChhbGVydCgiUmVhbGx5IGRlbGV0ZSIsIGJ1ZiwgTlVMTCwgIlllcyIs
ICJObyIsICd5JywgJ24nKSAhPSAxKQ0KICAgICAgIHJldHVybiBEX09fSzsNCiANCiAgICBTRUxF
Q1RFRF9JVEVNID0gZmlyc3Q7DQpAQCAtMjY0Myw3ICsyNjQ4LDcgQEANCiAgICBuYW1lID0gZ2V0
X2RhdGFmaWxlX3Byb3BlcnR5KGRhdCwgREFUX05BTUUpOw0KICAgIHNwcmludGYoYnVmLCAiJXM/
IiwgbmFtZVswXSA/IG5hbWUgOiAidGhpcyBpdGVtIik7DQogDQotICAgaWYgKGFsZXJ0KCJSZWFs
bHkgZGVsZXRlIiwgYnVmLCBOVUxMLCAiWWVzIiwgIkNhbmNlbCIsICd5JywgMjcpICE9IDEpDQor
ICAgaWYgKGFsZXJ0KCJSZWFsbHkgZGVsZXRlIiwgYnVmLCBOVUxMLCAiWWVzIiwgIk5vIiwgJ3kn
LCAnbicpICE9IDEpDQogICAgICAgcmV0dXJuIERfT19LOw0KIA0KICAgIGlmICghZG9fZWRpdCgi
TmV3IE9iamVjdCIsICJUeXBlOiIsICJOYW1lOiIsIHR5cGUsIE5VTEwsICh0eXBlID09IDApLCBU
UlVFKSkNCkBAIC0zMzc3LDcgKzMzODIsNyBAQA0KICAgIH0NCiANCiAgICBpZiAocmV0ICE9IDAp
IHsNCi0gICAgICBpZiAoYWxlcnQoIlRvb2wgcmV0dXJuZWQgYW4gZXJyb3Igc3RhdHVzISIsICJE
byB5b3Ugc3RpbGwgd2FudCB0byByZWdyYWIiLCAidGhlIG1vZGlmaWVkIGRhdGE/IiwgIkdyYWIi
LCAiQ2FuY2VsIiwgJ2cnLCAyNykgIT0gMSkNCisgICAgICBpZiAoYWxlcnQoIlRvb2wgcmV0dXJu
ZWQgYW4gZXJyb3Igc3RhdHVzISIsICJEbyB5b3Ugc3RpbGwgd2FudCB0byByZWdyYWIiLCAidGhl
IG1vZGlmaWVkIGRhdGE/IiwgIlllcyIsICJObyIsICd5JywgJ24nKSAhPSAxKQ0KIAkgZ290byBv
aHdlbGxpdHdhc2FuaWNlaWRlYTsNCiAgICB9DQogDQpAQCAtMzUwNSw3ICszNTEwLDcgQEANCiAN
CiAgICBzZXRfbW91c2Vfc3ByaXRlKG15X21vdXNlX3BvaW50ZXIpOw0KIA0KLSAgIHJldCA9IGFs
ZXJ0KGJ1ZiwgTlVMTCwgTlVMTCwgIlllcyIsICJDYW5jZWwiLCAneScsIDI3KTsNCisgICByZXQg
PSBhbGVydChidWYsIE5VTEwsIE5VTEwsICJZZXMiLCAiTm8iLCAneScsICduJyk7DQogDQogICAg
aWYgKGJ1c3lfbW91c2UpDQogICAgICAgc2V0X21vdXNlX3Nwcml0ZShteV9idXN5X3BvaW50ZXIp
Ow0K
------=_Part_11345_5257705.1122798955226
Content-Type: application/octet-stream; name="grabber.c.alerts.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="grabber.c.alerts.diff"
LS0tIGdyYWJiZXIuYy5tb3ZlCTIwMDUtMDctMzAgMTg6MDg6MTAuMDAwMDAwMDAwICswMDAwDQor
KysgZ3JhYmJlci5jLmFsZXJ0cwkyMDA1LTA3LTMwIDE4OjQzOjM4LjAwMDAwMDAwMCArMDAwMA0K
QEAgLTE0NDcsNiArMTQ0NywyMiBAQA0KIA0KIA0KIA0KKy8qIGhlbHBlciBmb3IgaW5mb3JtaW5n
IG9mIG11bHRpcGxlIHNlbGVjdGlvbnMgKi8NCitzdGF0aWMgdm9pZCBhbGVydF9tdWx0aXBsZV9z
ZWxlY3Rpb25zKHZvaWQpDQorew0KKyAgIGFsZXJ0KCJQbGVhc2UgY2hvb3NlIG9uZSBpdGVtLiIs
IE5VTEwsIE5VTEwsICJPSyIsIE5VTEwsIDEzLCAwKTsNCit9DQorDQorDQorDQorLyogaGVscGVy
IGZvciBpbmZvcm1pbmcgb2Ygbm8gc2VsZWN0aW9uICovDQorc3RhdGljIHZvaWQgYWxlcnRfbm9f
c2VsZWN0aW9uKHZvaWQpDQorew0KKyAgIGFsZXJ0KCJQbGVhc2UgbWFrZSBhIHZhbGlkIHNlbGVj
dGlvbi4iLCBOVUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorfQ0KKw0KKw0KKw0KIC8q
IGJyaW5ncyB1cCB0aGUgcHJvcGVydHkgZWRpdGluZyBkaWFsb2cgKi8NCiBzdGF0aWMgaW50IGVk
aXRfcHJvcGVydHkoY2hhciAqdGl0bGUsIGNoYXIgKnZhbHVlX3N0cmluZywgaW50IHR5cGUsIEFM
X0NPTlNUIGNoYXIgKnZhbCwgaW50IGNoYW5nZV90eXBlLCBpbnQgc2hvd190eXBlKQ0KIHsNCkBA
IC0xNDU4LDkgKzE0NzQsOSBAQA0KICAgIH0NCiAgICBlbHNlIHsNCiAgICAgICBpZiAoc2VsIDwg
MCkNCi0JIGFsZXJ0KCJDYW4ndCBzZXQgcHJvcGVydGllcyBmb3IgYSBtdWx0aXBsZSBzZWxlY3Rp
b24hIiwgTlVMTCwgTlVMTCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbXVsdGlwbGVf
c2VsZWN0aW9ucygpOw0KICAgICAgIGVsc2UNCi0JIGFsZXJ0KCJOb3RoaW5nIHRvIHNldCBwcm9w
ZXJ0aWVzIGZvciEiLCBOVUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorCSBhbGVydF9u
b19zZWxlY3Rpb24oKTsNCiAgICAgICByZXR1cm4gRF9PX0s7DQogICAgfQ0KIA0KQEAgLTE1MDIs
NyArMTUxOCw3IEBADQogICAgfQ0KICAgIGVsc2Ugew0KICAgICAgIGlmIChzZWwgPCAwKQ0KLQkg
YWxlcnQoIkNhbid0IHNldCBwcm9wZXJ0aWVzIGZvciBhIG11bHRpcGxlIHNlbGVjdGlvbiEiLCBO
VUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorCSBhbGVydF9tdWx0aXBsZV9zZWxlY3Rp
b25zKCk7DQogICAgfQ0KIA0KICAgIHJldHVybiBEX09fSzsNCkBAIC0xNTIyLDkgKzE1MzgsOSBA
QA0KIA0KICAgIGlmICgoc2VsIDw9IDApIHx8IChzZWwgPj0gZGF0YV9jb3VudCkpIHsNCiAgICAg
ICBpZiAoc2VsIDwgMCkNCi0JIGFsZXJ0KCJDYW4ndCByZW5hbWUgYSBtdWx0aXBsZSBzZWxlY3Rp
b24hIiwgTlVMTCwgTlVMTCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbXVsdGlwbGVf
c2VsZWN0aW9ucygpOw0KICAgICAgIGVsc2UNCi0JIGFsZXJ0KCJOb3RoaW5nIHRvIHJlbmFtZSEi
LCBOVUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorCSBhbGVydF9ub19zZWxlY3Rpb24o
KTsNCiAgICAgICByZXR1cm4gRF9PX0s7DQogICAgfQ0KIA0KQEAgLTE1NTQsNyArMTU3MCw3IEBA
DQogICAgfQ0KICAgIGVsc2Ugew0KICAgICAgIGlmIChzZWwgPCAwKQ0KLQkgYWxlcnQoIkNhbid0
IGRlbGV0ZSBwcm9wZXJ0aWVzIGZyb20gYSBtdWx0aXBsZSBzZWxlY3Rpb24hIiwgTlVMTCwgTlVM
TCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbXVsdGlwbGVfc2VsZWN0aW9ucygpOw0K
ICAgIH0NCiANCiAgICByZXR1cm4gRF9PX0s7DQpAQCAtMjQyMiw5ICsyNDM4LDkgQEANCiANCiAg
ICBpZiAoKHNlbCA8PSAwKSB8fCAoc2VsID49IGRhdGFfY291bnQpKSB7DQogICAgICAgaWYgKHNl
bCA8IDApDQotCSBhbGVydCgiQ2FuJ3QgZ3JhYiB0byBhIG11bHRpcGxlIHNlbGVjdGlvbiEiLCBO
VUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorCSBhbGVydF9tdWx0aXBsZV9zZWxlY3Rp
b25zKCk7DQogICAgICAgZWxzZQ0KLQkgYWxlcnQoIllvdSBtdXN0IGNyZWF0ZSBhbiBvYmplY3Qg
dG8gY29udGFpbiIsICJ0aGUgZGF0YSBiZWZvcmUgeW91IGNhbiBncmFiIGl0IiwgTlVMTCwgIk9L
IiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbm9fc2VsZWN0aW9uKCk7DQogICAgICAgcmV0dXJu
IERfT19LOw0KICAgIH0NCiANCkBAIC0yNTA1LDkgKzI1MjEsOSBAQA0KIA0KICAgIGlmICgoc2Vs
IDw9IDApIHx8IChzZWwgPj0gZGF0YV9jb3VudCkpIHsNCiAgICAgICBpZiAoc2VsIDwgMCkNCi0J
IGFsZXJ0KCJDYW4ndCBleHBvcnQgYSBtdWx0aXBsZSBzZWxlY3Rpb24hIiwgTlVMTCwgTlVMTCwg
Ik9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbXVsdGlwbGVfc2VsZWN0aW9ucygpOw0KICAg
ICAgIGVsc2UNCi0JIGFsZXJ0KCJOb3RoaW5nIHRvIGV4cG9ydCEiLCBOVUxMLCBOVUxMLCAiT0si
LCBOVUxMLCAxMywgMCk7DQorCSBhbGVydF9ub19zZWxlY3Rpb24oKTsNCiAgICAgICByZXR1cm4g
RF9PX0s7DQogICAgfQ0KIA0KQEAgLTI1NzgsNyArMjU5NCw3IEBADQogICAgfQ0KIA0KICAgIGlm
ICh0b2RlbF9jb3VudCA8PSAwKSB7DQotICAgICAgYWxlcnQoIk5vdGhpbmcgdG8gZGVsZXRlISIs
IE5VTEwsIE5VTEwsICJPSyIsIE5VTEwsIDEzLCAwKTsNCisgICAgICBhbGVydF9ub19zZWxlY3Rp
b24oKTsNCiAgICAgICByZXR1cm4gRF9PX0s7DQogICAgfQ0KIA0KQEAgLTI2MzQsMTEgKzI2NTAs
MTEgQEANCiAgICBDSEVDS19NRU5VX0hPT0soIk1vdmUiLCBEQVRFRElUX01FTlVfT0JKRUNUKTsN
CiANCiAgICBpZiAoU0VMRUNURURfSVRFTSA9PSAwKSB7DQotICAgICAgYWxlcnQoIk5vdGhpbmcg
dG8gbW92ZSEiLCBOVUxMLCBOVUxMLCAiT0siLCBOVUxMLCAxMywgMCk7DQorICAgICAgYWxlcnRf
bm9fc2VsZWN0aW9uKCk7DQogICAgICAgcmV0dXJuIERfT19LOw0KICAgIH0NCiAgICBlbHNlIGlm
IChzaW5nbGVfc2VsZWN0aW9uKCkgPCAwKSB7DQotICAgICAgYWxlcnQoIkNhbid0IG1vdmUgYSBt
dWx0aXBsZSBzZWxlY3Rpb24hIiwgTlVMTCwgTlVMTCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKyAg
ICAgIGFsZXJ0X211bHRpcGxlX3NlbGVjdGlvbnMoKTsNCiAgICAgICByZXR1cm4gRF9PX0s7DQog
ICAgfQ0KIA0KQEAgLTI3MTEsOSArMjcyNyw5IEBADQogICAgfQ0KICAgIGVsc2Ugew0KICAgICAg
IGlmIChzZWwgPCAwKQ0KLQkgYWxlcnQoIkNhbid0IHJlcGxhY2UgYSBtdWx0aXBsZSBzZWxlY3Rp
b24hIiwgTlVMTCwgTlVMTCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbXVsdGlwbGVf
c2VsZWN0aW9ucygpOw0KICAgICAgIGVsc2UNCi0JIGFsZXJ0KCJOb3RoaW5nIHRvIHJlcGxhY2Uh
IiwgTlVMTCwgTlVMTCwgIk9LIiwgTlVMTCwgMTMsIDApOw0KKwkgYWxlcnRfbm9fc2VsZWN0aW9u
KCk7DQogDQogICAgICAgcmV0dXJuIERfT19LOw0KICAgIH0NCkBAIC0zMzA0LDkgKzMzMjAsOSBA
QA0KIA0KICAgIGlmICgoc2VsIDw9IDApIHx8IChzZWwgPj0gZGF0YV9jb3VudCkpIHsNCiAgICAg
ICBpZiAoc2VsIDwgMCkNCi0JIGFsZXJ0KCJDYW4ndCBTaGVsbCBFZGl0IGEgbXVsdGlwbGUgc2Vs
ZWN0aW9uISIsIE5VTEwsIE5VTEwsICJPSyIsIE5VTEwsIDEzLCAwKTsNCisJIGFsZXJ0X211bHRp
cGxlX3NlbGVjdGlvbnMoKTsNCiAgICAgICBlbHNlDQotCSBhbGVydCgiTm90aGluZyB0byBTaGVs
bCBFZGl0ISIsIE5VTEwsIE5VTEwsICJPSyIsIE5VTEwsIDEzLCAwKTsNCisJIGFsZXJ0X25vX3Nl
bGVjdGlvbigpOw0KICAgICAgIHJldHVybiBEX09fSzsNCiAgICB9DQogDQo=
------=_Part_11345_5257705.1122798955226
Content-Type: application/octet-stream; name="grabber.c.help.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="grabber.c.help.diff"
LS0tIGdyYWJiZXIuYy5idXR0b25zLmFsZXJ0cwkyMDA1LTA3LTMwIDE4OjQzOjU4LjAwMDAwMDAw
MCArMDAwMA0KKysrIGdyYWJiZXIuYwkyMDA1LTA3LTMxIDA0OjA5OjI4LjAwMDAwMDAwMCArMDAw
MA0KQEAgLTI4LDYgKzI4LDggQEANCiAgICAjaW5jbHVkZSA8c3lzL2V4Y2VwdG4uaD4NCiAjZW5k
aWYNCiANCisjZGVmaW5lIEdSQUJCRVJfSEVMUF9QQVRIICIuLi9kb2NzL3R4dCINCisjZGVmaW5l
IEdSQUJCRVJfSEVMUF9GSUxFICJncmFiYmVyLnR4dCINCiANCiB0eXBlZGVmIHN0cnVjdCBEQVRB
SVRFTQ0KIHsNCkBAIC0yOTg5LDI3ICsyOTkxLDIzIEBADQogLyogaGFuZGxlIHRoZSBoZWxwIGNv
bW1hbmQgKi8NCiBzdGF0aWMgaW50IGhlbHBlcih2b2lkKQ0KIHsNCi0gICBjaGFyIGJ1ZlsyNTZd
Ow0KICAgIFBBQ0tGSUxFICpmOw0KICAgIGNoYXIgKmhlbHBfdGV4dCwgKmxhc3QsICpzOw0KICAg
IGludCBzaXplLCBpLCBqLCBjcjsNCiANCiAgICBDSEVDS19NRU5VX0hPT0soIkhlbHAiLCBEQVRF
RElUX01FTlVfSEVMUCk7DQogDQotICAgZ2V0X2V4ZWN1dGFibGVfbmFtZShidWYsIHNpemVvZihi
dWYpKTsNCi0gICBzdHJjcHkoZ2V0X2ZpbGVuYW1lKGJ1ZiksICJncmFiYmVyLnR4dCIpOw0KLQ0K
LSAgIHNpemUgPSBmaWxlX3NpemUoYnVmKTsNCisgICBzaXplID0gZmlsZV9zaXplKEdSQUJCRVJf
SEVMUF9QQVRIICIvIiBHUkFCQkVSX0hFTFBfRklMRSk7DQogICAgaWYgKHNpemUgPD0gMCkgew0K
LSAgICAgIGFsZXJ0KCJFcnJvciByZWFkaW5nIGdyYWJiZXIudHh0IiwgTlVMTCwgTlVMTCwgIk9o
IGRlYXIiLCBOVUxMLCAxMywgMCk7DQorICAgICAgYWxlcnQoIkVycm9yIHJlYWRpbmcgIiBHUkFC
QkVSX0hFTFBfRklMRSwgTlVMTCwgTlVMTCwgIk9oIGRlYXIiLCBOVUxMLCAxMywgMCk7DQogICAg
ICAgcmV0dXJuIERfUkVEUkFXOw0KICAgIH0NCiANCiAgICBncmFiYmVyX2hlbHBfdGV4dCA9IGhl
bHBfdGV4dCA9IG1hbGxvYyhzaXplKzEpOw0KIA0KLSAgIGYgPSBwYWNrX2ZvcGVuKGJ1ZiwgRl9S
RUFEKTsNCisgICBmID0gcGFja19mb3BlbihHUkFCQkVSX0hFTFBfUEFUSCAiLyIgR1JBQkJFUl9I
RUxQX0ZJTEUsIEZfUkVBRCk7DQogICAgaWYgKCFmKSB7DQotICAgICAgYWxlcnQoIkVycm9yIHJl
YWRpbmcgZ3JhYmJlci50eHQiLCBOVUxMLCBOVUxMLCAiT2ggZGVhciIsIE5VTEwsIDEzLCAwKTsN
CisgICAgICBhbGVydCgiRXJyb3IgcmVhZGluZyAiIEdSQUJCRVJfSEVMUF9GSUxFLCBOVUxMLCBO
VUxMLCAiT2ggZGVhciIsIE5VTEwsIDEzLCAwKTsNCiAgICAgICByZXR1cm4gRF9SRURSQVc7DQog
ICAgfQ0KIA0K
------=_Part_11345_5257705.1122798955226--