svn: /pear/pear-core/trunk/PEAR/ Installer.php

--7fcc307185d0ca8f2eb239688311da957490cc16
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

dufuz                                    Mon, 04 Jul 2011 19:51:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312911

Log:
Various cosmetics. Shorter variable name, more logical location of other variables.

Changed paths:
    U   pear/pear-core/trunk/PEAR/Installer.php


--7fcc307185d0ca8f2eb239688311da957490cc16
Content-Type: text/x-diff; charset="utf-8"
Content-Disposition: attachment; filename="svn-diffs-312911.txt"
Content-Transfer-Encoding: base64

TW9kaWZpZWQ6IHBlYXIvcGVhci1jb3JlL3RydW5rL1BFQVIvSW5zdGFsbGVyLnBocAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBwZWFyL3BlYXItY29yZS90cnVuay9QRUFSL0luc3RhbGxlci5waHAJMjAxMS0wNy0wNCAxOTo0OTo1
NCBVVEMgKHJldiAzMTI5MTApCisrKyBwZWFyL3BlYXItY29yZS90cnVuay9QRUFSL0luc3RhbGxlci5w
aHAJMjAxMS0wNy0wNCAxOTo1MTowNSBVVEMgKHJldiAzMTI5MTEpCkBAIC0yMTAsNyArMjEwLDcgQEAK
CiAgICAgICAgIGlmIChpc3NldCgkYXR0c1sncGxhdGZvcm0nXSkpIHsKICAgICAgICAgICAgIGlmIChl
bXB0eSgkb3MpKSB7Ci0gICAgICAgICAgICAgICAgJG9zID0gbmV3IE9TX0d1ZXNzKCk7CisgICAgICAg
ICAgICAgICAgJG9zID0gbmV3IE9TX0d1ZXNzOwogICAgICAgICAgICAgfQoKICAgICAgICAgICAgIGlm
IChzdHJsZW4oJGF0dHNbJ3BsYXRmb3JtJ10pICYmICRhdHRzWydwbGF0Zm9ybSddezB9ID09ICchJykg
ewpAQCAtMjkxLDggKzI5MSwxMCBAQAogICAgICAgICAgICAgcmV0dXJuICR0aGlzLT5yYWlzZUVycm9y
KCJTRUNVUklUWSBFUlJPUjogZmlsZSAkZmlsZSAoaW5zdGFsbGVkIHRvICRkZXN0X2ZpbGUpIGNvbnRh
aW5zIHBhcmVudCBkaXJlY3RvcnkgcmVmZXJlbmNlIC4uIiwgUEVBUl9JTlNUQUxMRVJfRkFJTEVEKTsK
ICAgICAgICAgfQoKLSAgICAgICAgaWYgKGVtcHR5KCR0aGlzLT5fb3B0aW9uc1sncmVnaXN0ZXItb25s
eSddKSAmJgotICAgICAgICAgICAgICAoIWZpbGVfZXhpc3RzKCRkZXN0X2RpcikgfHwgIWlzX2Rpcigk
ZGVzdF9kaXIpKSkgeworICAgICAgICBpZiAoCisgICAgICAgICAgICBlbXB0eSgkdGhpcy0+X29wdGlv
bnNbJ3JlZ2lzdGVyLW9ubHknXSkgJiYKKyAgICAgICAgICAgICghZmlsZV9leGlzdHMoJGRlc3RfZGly
KSB8fCAhaXNfZGlyKCRkZXN0X2RpcikpCisgICAgICAgICkgewogICAgICAgICAgICAgaWYgKCEkdGhp
cy0+bWtEaXJIaWVyKCRkZXN0X2RpcikpIHsKICAgICAgICAgICAgICAgICByZXR1cm4gJHRoaXMtPnJh
aXNlRXJyb3IoImZhaWxlZCB0byBta2RpciAkZGVzdF9kaXIiLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBQRUFSX0lOU1RBTExFUl9GQUlMRUQpOwpAQCAtMzU2LDEwICszNTgs
MTIgQEAKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgJHRvID0gJHRoaXMtPmNvbmZpZy0+Z2V0KCRhWyd0byddLCBudWxsLCAkY2hhbm5lbCk7
CiAgICAgICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChp
c19udWxsKCR0bykpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIWlzc2V0KCRvcHRp
b25zWydzb2Z0J10pKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICR0aGlzLT5sb2co
MCwgImludmFsaWQgcGVhci1jb25maWcgcmVwbGFjZW1lbnQ6ICRhW3RvXSIpOwogICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwog
ICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICB9IGVsc2VpZiAoJGFb
J3R5cGUnXSA9PSAncGFja2FnZS1pbmZvJykgewpAQCAtMzY5LDkgKzM3MywxMSBAQAogICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIGlmICghaXNzZXQoJG9wdGlvbnNbJ3NvZnQnXSkpIHsKICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgJHRoaXMtPmxvZygwLCAiaW52YWxpZCBwYWNrYWdlLWluZm8g
cmVwbGFjZW1lbnQ6ICRhW3RvXSIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKwogICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgICAgICAgICAg
fQogICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgaWYgKCFpc19udWxs
KCR0bykpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICRzdWJzdF9mcm9tW10gPSAkYVsnZnJvbSdd
OwogICAgICAgICAgICAgICAgICAgICAgICAgJHN1YnN0X3RvW10gPSAkdG87CkBAIC00MjYsMTEgKzQz
MiwxMiBAQAoKICAgICAgICAgICAgIC8vIHNldCBmaWxlIHBlcm1pc3Npb25zCiAgICAgICAgICAgICBp
ZiAoIU9TX1dJTkRPV1MpIHsKKyAgICAgICAgICAgICAgICAkdW1hc2sgPSAkdGhpcy0+Y29uZmlnLT5n
ZXQoJ3VtYXNrJyk7CiAgICAgICAgICAgICAgICAgaWYgKCRhdHRzWydyb2xlJ10gPT0gJ3NjcmlwdCcp
IHsKLSAgICAgICAgICAgICAgICAgICAgJG1vZGUgPSAwNzc3ICYgfihpbnQpb2N0ZGVjKCR0aGlzLT5j
b25maWctPmdldCgndW1hc2snKSk7CisgICAgICAgICAgICAgICAgICAgICRtb2RlID0gMDc3NyAmIH4o
aW50KW9jdGRlYygkdW1hc2spOwogICAgICAgICAgICAgICAgICAgICAkdGhpcy0+bG9nKDMsICIrIGNo
bW9kICt4ICRkZXN0X2ZpbGUiKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg
ICAgICAgICAkbW9kZSA9IDA2NjYgJiB+KGludClvY3RkZWMoJHRoaXMtPmNvbmZpZy0+Z2V0KCd1bWFz
aycpKTsKKyAgICAgICAgICAgICAgICAgICAgJG1vZGUgPSAwNjY2ICYgfihpbnQpb2N0ZGVjKCR1bWFz
ayk7CiAgICAgICAgICAgICAgICAgfQoKICAgICAgICAgICAgICAgICBpZiAoJGF0dHNbJ3JvbGUnXSAh
PSAnc3JjJykgewpAQCAtNDg2LDggKzQ5Myw4IEBACgogICAgICAgICAkY2hhbm5lbCA9ICRwa2ctPmdl
dENoYW5uZWwoKTsKICAgICAgICAgLy8gYXNzZW1ibGUgdGhlIGRlc3RpbmF0aW9uIHBhdGhzCi0gICAg
ICAgIGlmICghaW5fYXJyYXkoJGF0dHNbJ2F0dHJpYnMnXVsncm9sZSddLAotICAgICAgICAgICAgICBQ
RUFSX0luc3RhbGxlcl9Sb2xlOjpnZXRWYWxpZFJvbGVzKCRwa2ctPmdldFBhY2thZ2VUeXBlKCkpKSkg
eworICAgICAgICAkcm9sZXMgPSBQRUFSX0luc3RhbGxlcl9Sb2xlOjpnZXRWYWxpZFJvbGVzKCRwa2ct
PmdldFBhY2thZ2VUeXBlKCkpOworICAgICAgICBpZiAoIWluX2FycmF5KCRhdHRzWydhdHRyaWJzJ11b
J3JvbGUnXSwgJHJvbGVzKSkgewogICAgICAgICAgICAgcmV0dXJuICR0aGlzLT5yYWlzZUVycm9yKCdJ
bnZhbGlkIHJvbGUgYCcgLiAkYXR0c1snYXR0cmlicyddWydyb2xlJ10gLgogICAgICAgICAgICAgICAg
ICAgICAiJyBmb3IgZmlsZSAkZmlsZSIpOwogICAgICAgICB9CkBAIC01MTQsOCArNTIxLDcgQEAKCiAg
ICAgICAgICRmaW5hbF9kZXN0X2ZpbGUgPSAkaW5zdGFsbGVkX2FzID0gJGRlc3RfZmlsZTsKICAgICAg
ICAgaWYgKGlzc2V0KCR0aGlzLT5fb3B0aW9uc1sncGFja2FnaW5ncm9vdCddKSkgewotICAgICAgICAg
ICAgJGZpbmFsX2Rlc3RfZmlsZSA9ICR0aGlzLT5fcHJlcGVuZFBhdGgoJGZpbmFsX2Rlc3RfZmlsZSwK
LSAgICAgICAgICAgICAgICAkdGhpcy0+X29wdGlvbnNbJ3BhY2thZ2luZ3Jvb3QnXSk7CisgICAgICAg
ICAgICAkZmluYWxfZGVzdF9maWxlID0gJHRoaXMtPl9wcmVwZW5kUGF0aCgkZmluYWxfZGVzdF9maWxl
LCAkdGhpcy0+X29wdGlvbnNbJ3BhY2thZ2luZ3Jvb3QnXSk7CiAgICAgICAgIH0KCiAgICAgICAgICRk
ZXN0X2RpciAgPSBkaXJuYW1lKCRmaW5hbF9kZXN0X2ZpbGUpOwpAQCAtMTEwMCw3ICsxMTA2LDcgQEAK
ICAgICAgICAgICAgIH0KICAgICAgICAgfQoKLSAgICAgICAgJHRtcGRpciAgID0gZGlybmFtZSgkZGVz
Y2ZpbGUpOworICAgICAgICAkdG1wZGlyID0gZGlybmFtZSgkZGVzY2ZpbGUpOwogICAgICAgICBpZiAo
cmVhbHBhdGgoJGRlc2NmaWxlKSAhPSByZWFscGF0aCgkcGtnZmlsZSkpIHsKICAgICAgICAgICAgIC8v
IFVzZSB0aGUgdGVtcF9kaXIgc2luY2UgJGRlc2NmaWxlIGNhbiBjb250YWluIHRoZSBkb3dubG9hZCBk
aXIgcGF0aAogICAgICAgICAgICAgJHRtcGRpciA9ICR0aGlzLT5jb25maWctPmdldCgndGVtcF9kaXIn
LCBudWxsLCAncGVhci5waHAubmV0Jyk7CkBAIC0xMTEyLDcgKzExMTgsNyBAQAogICAgICAgICAgICAg
fQogICAgICAgICB9CgotICAgICAgICAkcGtnbmFtZSA9ICRwa2ctPmdldE5hbWUoKTsKKyAgICAgICAg
JG5hbWUgICAgPSAkcGtnLT5nZXROYW1lKCk7CiAgICAgICAgICRjaGFubmVsID0gJHBrZy0+Z2V0Q2hh
bm5lbCgpOwogICAgICAgICBpZiAoaXNzZXQoJHRoaXMtPl9vcHRpb25zWydwYWNrYWdpbmdyb290J10p
KSB7CiAgICAgICAgICAgICAkcmVnZGlyID0gJHRoaXMtPl9wcmVwZW5kUGF0aCgKQEAgLTExNTIsNyAr
MTE1OCw3IEBACiAgICAgICAgIGlmIChlbXB0eSgkb3B0aW9uc1snZm9yY2UnXSkgJiYKICAgICAgICAg
ICAgICAgKGZpbGVfZXhpc3RzKCR0aGlzLT5jb25maWctPmdldCgncGhwX2RpcicpKSAmJgogICAgICAg
ICAgICAgICAgaXNfZGlyKCR0aGlzLT5jb25maWctPmdldCgncGhwX2RpcicpKSkpIHsKLSAgICAgICAg
ICAgICR0ZXN0cCA9ICRjaGFubmVsID09ICdwZWFyLnBocC5uZXQnID8gJHBrZ25hbWUgOiBhcnJheSgk
Y2hhbm5lbCwgJHBrZ25hbWUpOworICAgICAgICAgICAgJHRlc3RwID0gJGNoYW5uZWwgPT0gJ3BlYXIu
cGhwLm5ldCcgPyAkbmFtZSA6IGFycmF5KCRjaGFubmVsLCAkbmFtZSk7CiAgICAgICAgICAgICAkaW5z
dGZpbGVsaXN0ID0gJHBrZy0+Z2V0SW5zdGFsbGF0aW9uRmlsZUxpc3QodHJ1ZSk7CiAgICAgICAgICAg
ICBpZiAoUEVBUjo6aXNFcnJvcigkaW5zdGZpbGVsaXN0KSkgewogICAgICAgICAgICAgICAgIHJldHVy
biAkaW5zdGZpbGVsaXN0OwpAQCAtMTI0Miw3ICsxMjQ4LDcgQEAKICAgICAgICAgICAgICAgICB9Cgog
ICAgICAgICAgICAgICAgIGlmIChjb3VudCgkdGVzdCkpIHsKLSAgICAgICAgICAgICAgICAgICAgJG1z
ZyA9ICIkY2hhbm5lbC8kcGtnbmFtZTogY29uZmxpY3RpbmcgZmlsZXMgZm91bmQ6XG4iOworICAgICAg
ICAgICAgICAgICAgICAkbXNnID0gIiRjaGFubmVsLyRuYW1lOiBjb25mbGljdGluZyBmaWxlcyBmb3Vu
ZDpcbiI7CiAgICAgICAgICAgICAgICAgICAgICRsb25nZXN0ID0gbWF4KGFycmF5X21hcCgic3RybGVu
IiwgYXJyYXlfa2V5cygkdGVzdCkpKTsKICAgICAgICAgICAgICAgICAgICAgJGZtdCA9ICIlJHtsb25n
ZXN0fXMgKCVzKVxuIjsKICAgICAgICAgICAgICAgICAgICAgZm9yZWFjaCAoJHRlc3QgYXMgJGZpbGUg
PT4gJGluZm8pIHsKQEAgLTEyNjksMzEgKzEyNzUsMzEgQEAKICAgICAgICAgaWYgKGVtcHR5KCRvcHRp
b25zWyd1cGdyYWRlJ10pICYmIGVtcHR5KCRvcHRpb25zWydzb2Z0J10pKSB7CiAgICAgICAgICAgICAv
LyBjaGVja3MgdG8gZG8gb25seSB3aGVuIGluc3RhbGxpbmcgbmV3IHBhY2thZ2VzCiAgICAgICAgICAg
ICBpZiAoJGNoYW5uZWwgPT0gJ3BlY2wucGhwLm5ldCcpIHsKLSAgICAgICAgICAgICAgICAkdGVzdCA9
ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJHBrZ25hbWUsICRjaGFubmVsKTsKKyAgICAg
ICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJG5hbWUsICRj
aGFubmVsKTsKICAgICAgICAgICAgICAgICBpZiAoISR0ZXN0KSB7Ci0gICAgICAgICAgICAgICAgICAg
ICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkcGtnbmFtZSwgJ3BlYXIucGhw
Lm5ldCcpOworICAgICAgICAgICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2th
Z2VFeGlzdHMoJG5hbWUsICdwZWFyLnBocC5uZXQnKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAg
ICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFj
a2FnZUV4aXN0cygkcGtnbmFtZSwgJGNoYW5uZWwpOworICAgICAgICAgICAgICAgICR0ZXN0ID0gJGlu
c3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkbmFtZSwgJGNoYW5uZWwpOwogICAgICAgICAgICAg
fQoKICAgICAgICAgICAgIGlmIChlbXB0eSgkb3B0aW9uc1snZm9yY2UnXSkgJiYgJHRlc3QpIHsKLSAg
ICAgICAgICAgICAgICByZXR1cm4gJHRoaXMtPnJhaXNlRXJyb3IoIiRjaGFubmVsLyRwa2duYW1lIGlz
IGFscmVhZHkgaW5zdGFsbGVkIik7CisgICAgICAgICAgICAgICAgcmV0dXJuICR0aGlzLT5yYWlzZUVy
cm9yKCIkY2hhbm5lbC8kbmFtZSBpcyBhbHJlYWR5IGluc3RhbGxlZCIpOwogICAgICAgICAgICAgfQog
ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJHVzZWNoYW5uZWwgPSAkY2hhbm5lbDsKICAgICAg
ICAgICAgIGlmICgkY2hhbm5lbCA9PSAncGVjbC5waHAubmV0JykgewotICAgICAgICAgICAgICAgICR0
ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkcGtnbmFtZSwgJGNoYW5uZWwpOwor
ICAgICAgICAgICAgICAgICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkbmFt
ZSwgJGNoYW5uZWwpOwogICAgICAgICAgICAgICAgIGlmICghJHRlc3QpIHsKLSAgICAgICAgICAgICAg
ICAgICAgJHRlc3QgPSAkaW5zdGFsbHJlZ2lzdHJ5LT5wYWNrYWdlRXhpc3RzKCRwa2duYW1lLCAncGVh
ci5waHAubmV0Jyk7CisgICAgICAgICAgICAgICAgICAgICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+
cGFja2FnZUV4aXN0cygkbmFtZSwgJ3BlYXIucGhwLm5ldCcpOwogICAgICAgICAgICAgICAgICAgICAk
dXNlY2hhbm5lbCA9ICdwZWFyLnBocC5uZXQnOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg
IH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgJHRlc3QgPSAkaW5zdGFsbHJlZ2lzdHJ5LT5wYWNrYWdl
RXhpc3RzKCRwa2duYW1lLCAkY2hhbm5lbCk7CisgICAgICAgICAgICAgICAgJHRlc3QgPSAkaW5zdGFs
bHJlZ2lzdHJ5LT5wYWNrYWdlRXhpc3RzKCRuYW1lLCAkY2hhbm5lbCk7CiAgICAgICAgICAgICB9Cgog
ICAgICAgICAgICAgaWYgKCR0ZXN0KSB7Ci0gICAgICAgICAgICAgICAgJHYxID0gJGluc3RhbGxyZWdp
c3RyeS0+cGFja2FnZUluZm8oJHBrZ25hbWUsICd2ZXJzaW9uJywgJHVzZWNoYW5uZWwpOworICAgICAg
ICAgICAgICAgICR2MSA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VJbmZvKCRuYW1lLCAndmVyc2lv
bicsICR1c2VjaGFubmVsKTsKICAgICAgICAgICAgICAgICAkdjIgPSAkcGtnLT5nZXRWZXJzaW9uKCk7
CiAgICAgICAgICAgICAgICAgJGNtcCA9IHZlcnNpb25fY29tcGFyZSgiJHYxIiwgIiR2MiIsICdndCcp
OwogICAgICAgICAgICAgICAgIGlmIChlbXB0eSgkb3B0aW9uc1snZm9yY2UnXSkgJiYgIXZlcnNpb25f
Y29tcGFyZSgiJHYyIiwgIiR2MSIsICdndCcpKSB7CkBAIC0xMzAyLDcgKzEzMDgsNyBAQAoKICAgICAg
ICAgICAgICAgICBpZiAoZW1wdHkoJG9wdGlvbnNbJ3JlZ2lzdGVyLW9ubHknXSkpIHsKICAgICAgICAg
ICAgICAgICAgICAgLy8gd2hlbiB1cGdyYWRpbmcsIHJlbW92ZSBvbGQgcmVsZWFzZSdzIGZpbGVzIGZp
cnN0OgotICAgICAgICAgICAgICAgICAgICBpZiAoUEVBUjo6aXNFcnJvcigkZXJyID0gJHRoaXMtPl9k
ZWxldGVQYWNrYWdlRmlsZXMoJHBrZ25hbWUsICR1c2VjaGFubmVsLAorICAgICAgICAgICAgICAgICAg
ICBpZiAoUEVBUjo6aXNFcnJvcigkZXJyID0gJHRoaXMtPl9kZWxldGVQYWNrYWdlRmlsZXMoJG5hbWUs
ICR1c2VjaGFubmVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlKSkpIHsKICAgICAgICAg
ICAgICAgICAgICAgICAgIGlmICghaXNzZXQoJG9wdGlvbnNbJ2lnbm9yZS1lcnJvcnMnXSkpIHsKICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gJHRoaXMtPnJhaXNlRXJyb3IoJGVycik7CkBA
IC0xMzMzLDI5ICsxMzM5LDIzIEBACiAgICAgICAgIH0KCiAgICAgICAgIGlmIChzdWJzdHIoJHBrZ2Zp
bGUsIC00KSAhPSAnLnhtbCcpIHsKLSAgICAgICAgICAgICR0bXBkaXIgLj0gRElSRUNUT1JZX1NFUEFS
QVRPUiAuICRwa2duYW1lIC4gJy0nIC4gJHBrZy0+Z2V0VmVyc2lvbigpOworICAgICAgICAgICAgJHRt
cGRpciAuPSBESVJFQ1RPUllfU0VQQVJBVE9SIC4gJG5hbWUgLiAnLScgLiAkcGtnLT5nZXRWZXJzaW9u
KCk7CiAgICAgICAgIH0KCiAgICAgICAgICR0aGlzLT5jb25maWdTZXQoJ2RlZmF1bHRfY2hhbm5lbCcs
ICRjaGFubmVsKTsKICAgICAgICAgLy8gaW5zdGFsbCBmaWxlcwoKLSAgICAgICAgJHZlciA9ICRwa2ct
PmdldFBhY2thZ2V4bWxWZXJzaW9uKCk7Ci0gICAgICAgIGlmICh2ZXJzaW9uX2NvbXBhcmUoJHZlciwg
JzIuMCcsICc+PScpKSB7Ci0gICAgICAgICAgICAkZmlsZWxpc3QgPSAkcGtnLT5nZXRJbnN0YWxsYXRp
b25GaWxlbGlzdCgpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgJGZpbGVsaXN0ID0gJHBr
Zy0+Z2V0RmlsZUxpc3QoKTsKLSAgICAgICAgfQotCisgICAgICAgICRmaWxlbGlzdCA9ICRwa2ctPmdl
dEluc3RhbGxhdGlvbkZpbGVsaXN0KCk7CiAgICAgICAgIGlmIChQRUFSOjppc0Vycm9yKCRmaWxlbGlz
dCkpIHsKICAgICAgICAgICAgIHJldHVybiAkZmlsZWxpc3Q7CiAgICAgICAgIH0KCi0gICAgICAgICRw
ID0gJiRpbnN0YWxscmVnaXN0cnktPmdldFBhY2thZ2UoJHBrZ25hbWUsICRjaGFubmVsKTsKKyAgICAg
ICAgJHAgPSAmJGluc3RhbGxyZWdpc3RyeS0+Z2V0UGFja2FnZSgkbmFtZSwgJGNoYW5uZWwpOwogICAg
ICAgICAkZGlydHJlZSA9IChlbXB0eSgkb3B0aW9uc1sncmVnaXN0ZXItb25seSddKSAmJiAkcCkgPyAk
cC0+Z2V0RGlyVHJlZSgpIDogZmFsc2U7CgogICAgICAgICAkcGtnLT5yZXNldEZpbGVsaXN0KCk7Ci0g
ICAgICAgICRwa2ctPnNldExhc3RJbnN0YWxsZWRWZXJzaW9uKCRpbnN0YWxscmVnaXN0cnktPnBhY2th
Z2VJbmZvKCRwa2ctPmdldFBhY2thZ2UoKSwKLSAgICAgICAgICAgICd2ZXJzaW9uJywgJHBrZy0+Z2V0
Q2hhbm5lbCgpKSk7CisgICAgICAgICR2ZXJzaW9uID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUlu
Zm8oJHBrZy0+Z2V0UGFja2FnZSgpLCAndmVyc2lvbicsICRwa2ctPmdldENoYW5uZWwoKSk7CisgICAg
ICAgICRwa2ctPnNldExhc3RJbnN0YWxsZWRWZXJzaW9uKCR2ZXJzaW9uKTsKICAgICAgICAgZm9yZWFj
aCAoJGZpbGVsaXN0IGFzICRmaWxlID0+ICRhdHRzKSB7CiAgICAgICAgICAgICAkdGhpcy0+ZXhwZWN0
RXJyb3IoUEVBUl9JTlNUQUxMRVJfRkFJTEVEKTsKICAgICAgICAgICAgIGlmICgkcGtnLT5nZXRQYWNr
YWdleG1sVmVyc2lvbigpID09ICcxLjAnKSB7CkBAIC0xNDE3LDE4ICsxNDE3LDE4IEBACiAgICAgICAg
ICAgICAvLyBpZiAnZm9yY2UnIGlzIHVzZWQsIHJlcGxhY2UgdGhlIGluZm8gaW4gcmVnaXN0cnkKICAg
ICAgICAgICAgICR1c2VjaGFubmVsID0gJGNoYW5uZWw7CiAgICAgICAgICAgICBpZiAoJGNoYW5uZWwg
PT0gJ3BlY2wucGhwLm5ldCcpIHsKLSAgICAgICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0
cnktPnBhY2thZ2VFeGlzdHMoJHBrZ25hbWUsICRjaGFubmVsKTsKKyAgICAgICAgICAgICAgICAkdGVz
dCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJG5hbWUsICRjaGFubmVsKTsKICAgICAg
ICAgICAgICAgICBpZiAoISR0ZXN0KSB7Ci0gICAgICAgICAgICAgICAgICAgICR0ZXN0ID0gJGluc3Rh
bGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkcGtnbmFtZSwgJ3BlYXIucGhwLm5ldCcpOworICAgICAg
ICAgICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJG5hbWUs
ICdwZWFyLnBocC5uZXQnKTsKICAgICAgICAgICAgICAgICAgICAgJHVzZWNoYW5uZWwgPSAncGVhci5w
aHAubmV0JzsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAg
ICAgICAgICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4aXN0cygkcGtnbmFtZSwgJGNo
YW5uZWwpOworICAgICAgICAgICAgICAgICR0ZXN0ID0gJGluc3RhbGxyZWdpc3RyeS0+cGFja2FnZUV4
aXN0cygkbmFtZSwgJGNoYW5uZWwpOwogICAgICAgICAgICAgfQoKICAgICAgICAgICAgIGlmICghZW1w
dHkoJG9wdGlvbnNbJ2ZvcmNlJ10pICYmICR0ZXN0KSB7Ci0gICAgICAgICAgICAgICAgJG9sZHZlcnNp
b24gPSAkaW5zdGFsbHJlZ2lzdHJ5LT5wYWNrYWdlSW5mbygkcGtnbmFtZSwgJ3ZlcnNpb24nLCAkdXNl
Y2hhbm5lbCk7Ci0gICAgICAgICAgICAgICAgJGluc3RhbGxyZWdpc3RyeS0+ZGVsZXRlUGFja2FnZSgk
cGtnbmFtZSwgJHVzZWNoYW5uZWwpOworICAgICAgICAgICAgICAgICRvbGR2ZXJzaW9uID0gJGluc3Rh
bGxyZWdpc3RyeS0+cGFja2FnZUluZm8oJG5hbWUsICd2ZXJzaW9uJywgJHVzZWNoYW5uZWwpOworICAg
ICAgICAgICAgICAgICRpbnN0YWxscmVnaXN0cnktPmRlbGV0ZVBhY2thZ2UoJG5hbWUsICR1c2VjaGFu
bmVsKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgICRyZXQgPSAkaW5zdGFsbHJlZ2lzdHJ5LT5h
ZGRQYWNrYWdlMigkcGtnKTsKICAgICAgICAgfSBlbHNlIHsKQEAgLTE0NDQsMTMgKzE0NDQsMTMgQEAK
CiAgICAgICAgICAgICAkdXNlY2hhbm5lbCA9ICRjaGFubmVsOwogICAgICAgICAgICAgaWYgKCRjaGFu
bmVsID09ICdwZWNsLnBocC5uZXQnKSB7Ci0gICAgICAgICAgICAgICAgJHRlc3QgPSAkaW5zdGFsbHJl
Z2lzdHJ5LT5wYWNrYWdlRXhpc3RzKCRwa2duYW1lLCAkY2hhbm5lbCk7CisgICAgICAgICAgICAgICAg
JHRlc3QgPSAkaW5zdGFsbHJlZ2lzdHJ5LT5wYWNrYWdlRXhpc3RzKCRuYW1lLCAkY2hhbm5lbCk7CiAg
ICAgICAgICAgICAgICAgaWYgKCEkdGVzdCkgewotICAgICAgICAgICAgICAgICAgICAkdGVzdCA9ICRp
bnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJHBrZ25hbWUsICdwZWFyLnBocC5uZXQnKTsKKyAg
ICAgICAgICAgICAgICAgICAgJHRlc3QgPSAkaW5zdGFsbHJlZ2lzdHJ5LT5wYWNrYWdlRXhpc3RzKCRu
YW1lLCAncGVhci5waHAubmV0Jyk7CiAgICAgICAgICAgICAgICAgICAgICR1c2VjaGFubmVsID0gJ3Bl
YXIucGhwLm5ldCc7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAg
ICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2thZ2VFeGlzdHMoJHBrZ25hbWUs
ICRjaGFubmVsKTsKKyAgICAgICAgICAgICAgICAkdGVzdCA9ICRpbnN0YWxscmVnaXN0cnktPnBhY2th
Z2VFeGlzdHMoJG5hbWUsICRjaGFubmVsKTsKICAgICAgICAgICAgIH0KCiAgICAgICAgICAgICAvLyBu
ZXc6IHVwZ3JhZGUgaW5zdGFsbHMgYSBwYWNrYWdlIGlmIGl0IGlzbid0IGluc3RhbGxlZApAQCAtMTQ1
OCw3ICsxNDU4LDcgQEAKICAgICAgICAgICAgICAgICAkcmV0ID0gJGluc3RhbGxyZWdpc3RyeS0+YWRk
UGFja2FnZTIoJHBrZyk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGlmICgk
dXNlY2hhbm5lbCAhPSAkY2hhbm5lbCkgewotICAgICAgICAgICAgICAgICAgICAkaW5zdGFsbHJlZ2lz
dHJ5LT5kZWxldGVQYWNrYWdlKCRwa2duYW1lLCAkdXNlY2hhbm5lbCk7CisgICAgICAgICAgICAgICAg
ICAgICRpbnN0YWxscmVnaXN0cnktPmRlbGV0ZVBhY2thZ2UoJG5hbWUsICR1c2VjaGFubmVsKTsKICAg
ICAgICAgICAgICAgICAgICAgJHJldCA9ICRpbnN0YWxscmVnaXN0cnktPmFkZFBhY2thZ2UyKCRwa2cp
OwogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICRyZXQgPSAkaW5z
dGFsbHJlZ2lzdHJ5LT51cGRhdGVQYWNrYWdlMigkcGtnKTsKQEAgLTE0NjksNyArMTQ2OSw3IEBACgog
ICAgICAgICBpZiAoISRyZXQpIHsKICAgICAgICAgICAgICR0aGlzLT5jb25maWdTZXQoJ2RlZmF1bHRf
Y2hhbm5lbCcsICRzYXZlY2hhbm5lbCk7Ci0gICAgICAgICAgICByZXR1cm4gJHRoaXMtPnJhaXNlRXJy
b3IoIkFkZGluZyBwYWNrYWdlICRjaGFubmVsLyRwa2duYW1lIHRvIHJlZ2lzdHJ5IGZhaWxlZCIpOwor
ICAgICAgICAgICAgcmV0dXJuICR0aGlzLT5yYWlzZUVycm9yKCJBZGRpbmcgcGFja2FnZSAkY2hhbm5l
bC8kbmFtZSB0byByZWdpc3RyeSBmYWlsZWQiKTsKICAgICAgICAgfQogICAgICAgICAvLyB9fX0KCg==
--7fcc307185d0ca8f2eb239688311da957490cc16--