X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=yfRqKWngR5kXRQhJp0zyJB6+gJatynwz39Rs9f4r+fQ=; b=nRdbDdaIoG0yQh/3ncV9FjYDgST2h96b51NgWd2SVt/e+rDpMOOa64+Ww8LF0L+54L 2UTPc6Br2k9TgRGr2VFSzlCQGKPz4A5tnaSPoPLCZ1LWymXndMIc2jJoUJMOXALX9DtA gQcAKM+OnS8X7Y1hWmkD99WKLOetuQUSNI2ih9asvFbqeLtDgCT8OyImgrJbDMyacfCI lmjEilOBkWWLQQ4lPmsU0/wexVIqdKMElediT6lH2WZ7MpptbzzZLgI0UF6ZgnCvztE3 2TCddtWcX/IXgxTsCtxPtQp8z4CO407gZmmb6zMd8Ed5ePRN4d2AYFFsuG83i0i/qGhN YtWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=yfRqKWngR5kXRQhJp0zyJB6+gJatynwz39Rs9f4r+fQ=; b=dKZSfsxK5kOgJ6D++hlE8cYiL06L3o9CMVWgVzs6RXTxokOtO1eUh9/u4jUzX/HiEn Etjre8umTWUIvwsfQM1V3a5wVIu72vxNbsnVQMqOWkpzVHkjdV9L3wcBFSmP88DissXM /xUfsG/hK3sL20Ggu3orYL6sub5NObAxoAKvCbDzXCuA2orVjsdlXpEanNZEAsEillUT +822StcaNT8aNxLKFK6A/Pfay2CsJz6v0II9muYKhF/+bjCEyHdZo+1lEgnJJzE7S5u8 o3dgeK0cK3P5upcfElteDRZkuGYaxafbjJNBKOv9fke+hLBVBezy/O5iEJJibiaOxLxV Volw== X-Gm-Message-State: AG10YORGuLECth+HIcQzOVX2ZZoi1y7tngpxKBkDe85gpwzgcqLo5Z6f/eFBCqZ3Xj0qzQ//rj7GeTKUxlSKUA== MIME-Version: 1.0 X-Received: by 10.28.1.23 with SMTP id 23mr5455137wmb.37.1452990887700; Sat, 16 Jan 2016 16:34:47 -0800 (PST) Date: Sat, 16 Jan 2016 15:34:47 -0900 Message-ID: Subject: [geda-user] cleaner version of fixes to file format plugin From: "Britton Kerin (britton DOT kerin AT gmail DOT com) [via geda-user AT delorie DOT com]" To: geda-user AT delorie DOT com, Milan Prochac Content-Type: multipart/mixed; boundary=001a113d7c3eb950ce05297ccd05 Reply-To: geda-user AT delorie DOT com --001a113d7c3eb950ce05297ccd05 Content-Type: multipart/alternative; boundary=001a113d7c3eb950c805297ccd03 --001a113d7c3eb950c805297ccd03 Content-Type: text/plain; charset=UTF-8 The attached diff is against the version bert checked in but it lacks introduced bugs and most irrelevant junk. I also pushed it to LP1532611_fixes --001a113d7c3eb950c805297ccd03 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

The attached diff is against the versi= on bert checked in but it lacks introduced bugs and most irrelevant junk.

I also pushed it to=C2=A0LP15= 32611_fixes
--001a113d7c3eb950c805297ccd03-- --001a113d7c3eb950ce05297ccd05 Content-Type: application/octet-stream; name=uncolored_new_diff Content-Disposition: attachment; filename=uncolored_new_diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_ijht7czh0 ZGlmZiAtLWdpdCBhL3NyYy9NYWtlZmlsZS5hbSBiL3NyYy9NYWtlZmlsZS5hbQppbmRleCA2OWE0 ZGYyLi40NGJiY2M2IDEwMDY0NAotLS0gYS9zcmMvTWFrZWZpbGUuYW0KKysrIGIvc3JjL01ha2Vm aWxlLmFtCkBAIC02NCw2ICs2NCw3IEBAIFBDQl9TUkNTID0gXAogCWVkaWZfcGFyc2UuaCBcCiAJ ZXJyb3IuYyBcCiAJZXJyb3IuaCBcCisJZmZ0ZW1wbGF0ZS5jIFwKIAlmaWxlLmMgXAogCWZpbGUu aCBcCiAJZmluZC5jIFwKQEAgLTIxOCw3ICsyMTksNyBAQCBjaGVja19QUk9HUkFNUyA9IHVuaXR0 ZXN0CiBjaGVja19TQ1JJUFRTID0gdW5pdHRlc3QKIFRFU1RTID0gdW5pdHRlc3QKIAotIyBBY3Rp b24sIEF0dHJpYnV0ZSwgYW5kIEZsYWcgbGlzdHMuCisjIEFjdGlvbiwgQXR0cmlidXRlLCBGbGFn LCBhbmQgRm9ybWF0IGxpc3RzLgogY29yZV9saXN0cy5oIDogJHtQQ0JfU1JDU30gTWFrZWZpbGUK IAl0cnVlID4gJEAKIAkoZm9yIGYgaW4gJHtQQ0JfU1JDU30gOyBkbyBjYXQgJChzcmNkaXIpLyQk ZiA7IGRvbmUpIHwgZ3JlcCAiXlJFR0lTVEVSIiA+ICRALnRtcApkaWZmIC0tZ2l0IGEvc3JjL2Zm dGVtcGxhdGUuYyBiL3NyYy9mZnRlbXBsYXRlLmMKbmV3IGZpbGUgbW9kZSAxMjAwMDAKaW5kZXgg MDAwMDAwMC4uYmUyODU3YgotLS0gL2Rldi9udWxsCisrKyBiL3NyYy9mZnRlbXBsYXRlLmMKQEAg LTAsMCArMSBAQAorZmlsZWZvcm1hdHMvdGVtcGxhdGUuYwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKZGlmZiAtLWdpdCBhL3NyYy9maWxlLmMgYi9zcmMvZmlsZS5jCmluZGV4IDVhZjc2MjQu LmVlZGRmZTUgMTAwNjQ0Ci0tLSBhL3NyYy9maWxlLmMKKysrIGIvc3JjL2ZpbGUuYwpAQCAtNDMs NiArNDMsOCBAQAogCiAjaW5jbHVkZSAiZ2xvYmFsLmgiCiAKKyNpbmNsdWRlIDxhc3NlcnQuaD4K KwogI2luY2x1ZGUgPGRpcmVudC5oPgogI2lmZGVmIEhBVkVfUFdEX0gKICNpbmNsdWRlIDxwd2Qu aD4KQEAgLTEyNyw5ICsxMjksNiBAQCBzdGF0aWMgaW50IFdyaXRlUGlwZSAoY2hhciAqLCBib29s KTsKIHN0YXRpYyBpbnQgUGFyc2VMaWJyYXJ5VHJlZSAodm9pZCk7CiBzdGF0aWMgaW50IExvYWRO ZXdsaWJGb290cHJpbnRzRnJvbURpcihjaGFyICpwYXRoLCBjaGFyICp0b3BwYXRoLCBib29sIHJl Y3Vyc2l2ZSk7CiAKLS8vZXh0ZXJuIGludCBTYXZlUENCV2l0aEZvcm1hdCAoUENCVHlwZSAqcGNi LCBjaGFyICpmaWxlbmFtZSwgY2hhciAqZmlsZWZvcm1hdCk7Ci0vL2V4dGVybiBpbnQgTG9hZFBD QldpdGhGb3JtYXQgKFBDQlR5cGUgKipwY2IsIGNoYXIgKmZpbGVuYW1lLCBjaGFyICpmaWxlZm9y bWF0LCBjaGFyICoqbmV3X2Zvcm1hdCk7Ci0KIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICogRmxh ZyBoZWxwZXIgZnVuY3Rpb25zCiAgKi8KQEAgLTE2OTQsNyArMTY5Myw3IEBAIHN0YXRpYyBISURf Rm9ybWF0ICoqYWxsX2Zvcm1hdHMgPSAwOwogICAgaWQgPT0gTlVMTCAtPiBmdW5jdGlvbiBub3Qg aW1wbGVtZW50ZWQgZm9yIHNwZWNpZmljIGZvcm1hdAogKi8KIGludAotaGlkX2dldF9maWxlX2Zv cm1hdChpbnQgaWR4LCBpbnQgbG9hZF9zYXZlLCBjaGFyICoqaWQsIGNoYXIgKipuYW1lLCBjaGFy ICoqbWltZSwgY2hhciAqKipwYXR0ZXJucykKK2hpZF9nZXRfZmlsZV9mb3JtYXQoaW50IGlkeCwg aW50IGxvYWRfc2F2ZSwgaW50ICppc19kZWZhdWx0LCBjaGFyICoqaWQsIGNoYXIgKipuYW1lLCBj aGFyICoqbWltZSwgY2hhciAqKipwYXR0ZXJucykKIHsKICAgICBpZiAoaWR4ID49IG5fZm9ybWF0 cykKICAgICAgICAgcmV0dXJuIDA7CkBAIC0xNzA0LDYgKzE3MDMsNyBAQCBoaWRfZ2V0X2ZpbGVf Zm9ybWF0KGludCBpZHgsIGludCBsb2FkX3NhdmUsIGNoYXIgKippZCwgY2hhciAqKm5hbWUsIGNo YXIgKiptaW1lLAogCXJldHVybiAxOwogICAgICAgfQogCisgICAgKmlzX2RlZmF1bHQgPSBhbGxf Zm9ybWF0c1tpZHhdLT5kZWZhdWx0X2Zvcm1hdDsKICAgICAqaWQgPSBhbGxfZm9ybWF0c1tpZHhd LT5pZDsKICAgICAqbmFtZSA9IGFsbF9mb3JtYXRzW2lkeF0tPmRlc2NyaXB0aW9uOwogICAgICpt aW1lID0gYWxsX2Zvcm1hdHNbaWR4XS0+bWltZXR5cGU7CkBAIC0xNzU2LDEzICsxNzU2LDE3IEBA IGNoYXIgKgogaGlkX2dldF9kZWZhdWx0X2Zvcm1hdF9pZCAoY2hhciAqZGVzYykKIHsKICAgaW50 IGk7CisgIGNoYXIgKnJlc3VsdCA9IE5VTEw7CiAKICAgZm9yIChpID0gMDsgaSA8IG5fZm9ybWF0 czsgaSsrKQogICAgIHsKLSAgICAgIGlmIChhbGxfZm9ybWF0c1tpXS0+ZGVmYXVsdF9mb3JtYXQp Ci0gICAgICAgIHJldHVybiBhbGxfZm9ybWF0c1tpXS0+aWQ7CisgICAgICBpZiAoYWxsX2Zvcm1h dHNbaV0tPmRlZmF1bHRfZm9ybWF0KSB7CisgICAgICAgIGFzc2VydCAocmVzdWx0ID09IE5VTEwp OyAgIC8vIFRoZXJlIHNob3VsZCBvbmx5IGJlIG9uZSBkZWZhdWx0IGZvcm1hdAorICAgICAgICBy ZXN1bHQgPSBhbGxfZm9ybWF0c1tpXS0+aWQ7CisgICAgICB9CiAgICAgfQotICByZXR1cm4gTlVM TDsKKworICByZXR1cm4gcmVzdWx0OwogfQogCiBleHRlcm4gaW50IGhpZF9maWxlX2Zvcm1hdF9s b2FkYWJsZShjaGFyICppZCkKZGlmZiAtLWdpdCBhL3NyYy9oaWQuaCBiL3NyYy9oaWQuaAppbmRl eCBkODU1M2EzLi5hOTRmNDFkIDEwMDY0NAotLS0gYS9zcmMvaGlkLmgKKysrIGIvc3JjL2hpZC5o CkBAIC0yOTcsNyArMjk3LDcgQEAgZXh0ZXJuICJDIgogZXh0ZXJuIGNoYXIgKiBoaWRfZ2V0X2Zv cm1hdF9pZF9ieV9kZXNjIChjaGFyICpkZXNjKTsKIGV4dGVybiBjaGFyICogaGlkX2dldF9mb3Jt YXRfaWRfYnlfaWR4IChpbnQpOwogZXh0ZXJuIGNoYXIgKiBoaWRfZ2V0X2RlZmF1bHRfZm9ybWF0 X2lkICgpOwotZXh0ZXJuIGludCBoaWRfZ2V0X2ZpbGVfZm9ybWF0KGludCBpZHgsIGludCBsb2Fk X3NhdmUsIGNoYXIgKippZCwgY2hhciAqKm5hbWUsIGNoYXIgKiptaW1lLCBjaGFyICoqKnBhdHRl cm5zKTsKK2V4dGVybiBpbnQgaGlkX2dldF9maWxlX2Zvcm1hdChpbnQgaWR4LCBpbnQgbG9hZF9z YXZlLCBpbnQgKmlzX2RlZmF1bHQsIGNoYXIgKippZCwgY2hhciAqKm5hbWUsIGNoYXIgKiptaW1l LCBjaGFyICoqKnBhdHRlcm5zKTsKIGV4dGVybiBpbnQgaGlkX2ZpbGVfZm9ybWF0X2xvYWRhYmxl KGNoYXIgKmlkKTsKIAogCmRpZmYgLS1naXQgYS9zcmMvaGlkL2d0ay9ndWktZGlhbG9nLmMgYi9z cmMvaGlkL2d0ay9ndWktZGlhbG9nLmMKaW5kZXggOWM1N2NiMi4uZjI0MWQ0OCAxMDA2NDQKLS0t IGEvc3JjL2hpZC9ndGsvZ3VpLWRpYWxvZy5jCisrKyBiL3NyYy9oaWQvZ3RrL2d1aS1kaWFsb2cu YwpAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgImRhdGEuaCIKICNpbmNsdWRlICJndWkuaCIK IAorI2luY2x1ZGUgPGFzc2VydC5oPgorCiAjaWZkZWYgSEFWRV9MSUJETUFMTE9DCiAjaW5jbHVk ZSA8ZG1hbGxvYy5oPgogI2VuZGlmCkBAIC0zMDgsMjEgKzMxMCw2NSBAQCBnaGlkX2RpYWxvZ19m aWxlX3NlbGVjdF9vcGVuIChnY2hhciAqIHRpdGxlLCBnY2hhciAqKiBwYXRoLCBnY2hhciAqIHNo b3J0Y3V0cykKICAgICAvKiBhZGQgYSBmaWx0ZXIgZm9yIGxheW91dCBmaWxlcyAqLwogICAgIEd0 a0ZpbGVGaWx0ZXIgKnBjYl9maWx0ZXI7CiAgICAgaW50IGlkeCA9IDAsIHBpOworICAgIGludCBp c19kZWZhdWx0X2Zvcm1hdDsKICAgICBjaGFyICpmaWx0ZXJfaWQsICpmaWx0ZXJfbmFtZSwgKmZp bHRlcl9taW1lLCAqKmZpbHRlcl9wYXR0ZXJuczsKIAotICAgIHdoaWxlIChoaWRfZ2V0X2ZpbGVf Zm9ybWF0KGlkeCwgMCwgJmZpbHRlcl9pZCwgJmZpbHRlcl9uYW1lLCAmZmlsdGVyX21pbWUsICZm aWx0ZXJfcGF0dGVybnMpKSB7Ci0gICAgICAgIGlmIChmaWx0ZXJfaWQgIT0gTlVMTCApIHsKLSAg ICAgICAgICAgIHBjYl9maWx0ZXIgPSBndGtfZmlsZV9maWx0ZXJfbmV3ICgpOwotICAgICAgICAg ICAgZ3RrX2ZpbGVfZmlsdGVyX3NldF9uYW1lIChwY2JfZmlsdGVyLCBmaWx0ZXJfbmFtZSk7Ci0g ICAgICAgICAgICBndGtfZmlsZV9maWx0ZXJfYWRkX21pbWVfdHlwZSAocGNiX2ZpbHRlciwgZmls dGVyX21pbWUpOwotCSAgICBwaSA9IDA7Ci0JICAgIHdoaWxlIChmaWx0ZXJfcGF0dGVybnNbcGld ICE9IDAgKSB7Ci0JCWd0a19maWxlX2ZpbHRlcl9hZGRfcGF0dGVybiAocGNiX2ZpbHRlciwgZmls dGVyX3BhdHRlcm5zW3BpXSk7Ci0JCXBpKys7Ci0JICAgIH0KLSAgICAgICAgICAgIGd0a19maWxl X2Nob29zZXJfYWRkX2ZpbHRlciAoR1RLX0ZJTEVfQ0hPT1NFUiAoZGlhbG9nKSwgcGNiX2ZpbHRl cik7Ci0JfQotICAgICAgICBpZHgrKzsKKworICAgIC8vIFRoZSBkZWZhdWx0IGZvcm1hdCBzaG91 bGQgZ28gYXQgdGhlIHRvcCBvZiB0aGUgZmlsdGVyIGxpc3QuICBGSVhNRToKKyAgICAvLyBhY3R1 YWxseSBpdCBzaG91bGQgcGVyaGFwcyBiZSB0aGUgZGVmYXVsdCBvcHRpb24sIHJhdGhlciB0aGFu ICJhbGwiCisgICAgLy8gKHdoaWNoIGlzIGFscmVhZHkgYWRkZWQgYWJvdmUpLgorICAgIGJvb2wg Zm91bmRfZGVmYXVsdCA9IGZhbHNlOworICAgIHdoaWxlICgKKyAgICAgICAgaGlkX2dldF9maWxl X2Zvcm1hdCAoCisgICAgICAgICAgaWR4LAorICAgICAgICAgIDAsCisgICAgICAgICAgJmlzX2Rl ZmF1bHRfZm9ybWF0LAorICAgICAgICAgICZmaWx0ZXJfaWQsCisgICAgICAgICAgJmZpbHRlcl9u YW1lLAorICAgICAgICAgICZmaWx0ZXJfbWltZSwKKyAgICAgICAgICAmZmlsdGVyX3BhdHRlcm5z ICkgKSB7CisgICAgICBpZiAoIGlzX2RlZmF1bHRfZm9ybWF0ICkgeworICAgICAgICAvLyBUaGUg ZGVmYXVsdCBmb3JtYXQgaGFkIGJldHRlciBiZSBidWlsdC1pbiBhbmQgY2FwYWJsZSBvZiBsb2Fk CisgICAgICAgIGFzc2VydCAoZmlsdGVyX2lkICE9IE5VTEwpOyAgCisgICAgICAgIC8vIFRoZXJl IGJldHRlciBub3QgYmUgbW9yZSB0aGFuIG9uZSBkZWZhdWx0LiAgRklYTUU6IE1lc3NhZ2UgZm9y IHRoaXMKKyAgICAgICAgLy8gYXMgd2VsbCBpbiBjYXNlIG9mIHNjcmV3ZWQtdXAgcGx1Z2lucyB0 aGF0IHdhbnQgdG8gc2V0IGRlZmF1bHQ/CisgICAgICAgIGFzc2VydCAoISBmb3VuZF9kZWZhdWx0 KTsKKyAgICAgICAgZm91bmRfZGVmYXVsdCA9IHRydWU7CisgICAgICAgIHBjYl9maWx0ZXIgPSBn dGtfZmlsZV9maWx0ZXJfbmV3ICgpOworICAgICAgICBndGtfZmlsZV9maWx0ZXJfc2V0X25hbWUg KHBjYl9maWx0ZXIsIGZpbHRlcl9uYW1lKTsKKyAgICAgICAgZ3RrX2ZpbGVfZmlsdGVyX2FkZF9t aW1lX3R5cGUgKHBjYl9maWx0ZXIsIGZpbHRlcl9taW1lKTsKKyAgICAgICAgcGkgPSAwOworICAg ICAgICB3aGlsZSAoZmlsdGVyX3BhdHRlcm5zW3BpXSAhPSAwICkgeworICAgICAgICAgIGd0a19m aWxlX2ZpbHRlcl9hZGRfcGF0dGVybiAocGNiX2ZpbHRlciwgZmlsdGVyX3BhdHRlcm5zW3BpXSk7 CisgICAgICAgICAgcGkrKzsKKyAgICAgICAgfQorICAgICAgICBndGtfZmlsZV9jaG9vc2VyX2Fk ZF9maWx0ZXIgKEdUS19GSUxFX0NIT09TRVIgKGRpYWxvZyksIHBjYl9maWx0ZXIpOworICAgICAg fQorICAgICAgaWR4Kys7CisgICAgfQorCisgICAgLy8gTm93IGFkZCBhbGwgdGhlIG90aGVyIG5v bi1kZWZhdWx0IGZvcm1hdHMKKyAgICBpZHggPSAwOworICAgIHdoaWxlICgKKyAgICAgICAgaGlk X2dldF9maWxlX2Zvcm1hdCAoCisgICAgICAgICAgaWR4LAorICAgICAgICAgIDAsCisgICAgICAg ICAgJmlzX2RlZmF1bHRfZm9ybWF0LAorICAgICAgICAgICZmaWx0ZXJfaWQsICZmaWx0ZXJfbmFt ZSwKKyAgICAgICAgICAmZmlsdGVyX21pbWUsCisgICAgICAgICAgJmZpbHRlcl9wYXR0ZXJucyAp ICkgeworICAgICAgaWYgKGZpbHRlcl9pZCAhPSBOVUxMICYmICghIGlzX2RlZmF1bHRfZm9ybWF0 KSApIHsKKyAgICAgICAgcGNiX2ZpbHRlciA9IGd0a19maWxlX2ZpbHRlcl9uZXcgKCk7CisgICAg ICAgIGd0a19maWxlX2ZpbHRlcl9zZXRfbmFtZSAocGNiX2ZpbHRlciwgZmlsdGVyX25hbWUpOwor ICAgICAgICBndGtfZmlsZV9maWx0ZXJfYWRkX21pbWVfdHlwZSAocGNiX2ZpbHRlciwgZmlsdGVy X21pbWUpOworICAgICAgICBwaSA9IDA7CisgICAgICAgIHdoaWxlIChmaWx0ZXJfcGF0dGVybnNb cGldICE9IDAgKSB7CisgICAgICAgICAgZ3RrX2ZpbGVfZmlsdGVyX2FkZF9wYXR0ZXJuIChwY2Jf ZmlsdGVyLCBmaWx0ZXJfcGF0dGVybnNbcGldKTsKKyAgICAgICAgICBwaSsrOworICAgICAgICB9 CisgICAgICAgIGd0a19maWxlX2Nob29zZXJfYWRkX2ZpbHRlciAoR1RLX0ZJTEVfQ0hPT1NFUiAo ZGlhbG9nKSwgcGNiX2ZpbHRlcik7CisgICAgICB9CisgICAgICBpZHgrKzsKICAgICB9CiAgIH0K IApAQCAtNTA1LDEwICs1NTEsNDUgQEAgZ2hpZF9kaWFsb2dfZmlsZV9zZWxlY3Rfc2F2ZSAoZ2No YXIgKiB0aXRsZSwgZ2NoYXIgKiogcGF0aCwgZ2NoYXIgKiogZm9ybWF0LCBnY2gKICAgaWYgKGZv cm1hdCAhPSBOVUxMICkgewogICAgIEd0a0ZpbGVGaWx0ZXIgKnBjYl9maWx0ZXI7CiAgICAgaW50 IGlkeCA9IDAsIHBpOworICAgIGludCBpc19kZWZhdWx0X2Zvcm1hdDsKICAgICBjaGFyICpmaWx0 ZXJfaWQsICpmaWx0ZXJfbmFtZSwgKmZpbHRlcl9taW1lLCAqKmZpbHRlcl9wYXR0ZXJuczsKIAot ICAgIHdoaWxlIChoaWRfZ2V0X2ZpbGVfZm9ybWF0KGlkeCwgMCwgJmZpbHRlcl9pZCwgJmZpbHRl cl9uYW1lLCAmZmlsdGVyX21pbWUsICZmaWx0ZXJfcGF0dGVybnMpKSB7Ci0gICAgICAgIGlmIChm aWx0ZXJfaWQgIT0gTlVMTCApIHsKKyAgICAvLyBXZSB3YW50IHRvIG1ha2Ugc3VyZSB0aGF0IHRo ZSBkZWZhdWx0IGZvcm1hdCBnZXRzIGFkZGVkIHRvIHRoZSBmaWx0ZXIKKyAgICAvLyBmaXJzdCwg c28gdGhhdCBpdCBlbmRzIHVwIGFzIHRoZSBkZWZhdWx0IHNlbGVjdGlvbiBhbmQgYXQgdGhlIHRv cCBvZgorICAgIC8vIHRoZSBsaXN0IGluIHRoZSBHVUkKKyAgICBib29sIGZvdW5kX2RlZmF1bHQg PSBmYWxzZTsKKyAgICB3aGlsZSAoCisgICAgICAgIGhpZF9nZXRfZmlsZV9mb3JtYXQgKAorICAg ICAgICAgIGlkeCwKKyAgICAgICAgICAwLAorICAgICAgICAgICZpc19kZWZhdWx0X2Zvcm1hdCwK KyAgICAgICAgICAmZmlsdGVyX2lkLCAmZmlsdGVyX25hbWUsCisgICAgICAgICAgJmZpbHRlcl9t aW1lLAorICAgICAgICAgICZmaWx0ZXJfcGF0dGVybnMpICkgeworICAgICAgaWYgKCBpc19kZWZh dWx0X2Zvcm1hdCApIHsKKyAgICAgICAgLy8gVGhlIGRlZmF1bHQgZm9ybWF0IGhhZCBiZXR0ZXIg YmUgYnVpbHQtaW4gYW5kIGNhcGFibGUgb2Ygc2F2ZQorICAgICAgICBhc3NlcnQgKGZpbHRlcl9p ZCAhPSBOVUxMKTsgIAorICAgICAgICAvLyBUaGVyZSBiZXR0ZXIgbm90IGJlIG1vcmUgdGhhbiBv bmUgZGVmYXVsdC4gIEZJWE1FOiBNZXNzYWdlIGZvciB0aGlzCisgICAgICAgIC8vIGFzIHdlbGwg aW4gY2FzZSBvZiBzY3Jld2VkLXVwIHBsdWdpbnMgdGhhdCB3YW50IHRvIHNldCBkZWZhdWx0Pwor ICAgICAgICBhc3NlcnQgKCEgZm91bmRfZGVmYXVsdCk7CisgICAgICAgIGZvdW5kX2RlZmF1bHQg PSB0cnVlOworICAgICAgICBwY2JfZmlsdGVyID0gZ3RrX2ZpbGVfZmlsdGVyX25ldyAoKTsKKyAg ICAgICAgZ3RrX2ZpbGVfZmlsdGVyX3NldF9uYW1lIChwY2JfZmlsdGVyLCBmaWx0ZXJfbmFtZSk7 CisgICAgICAgIGd0a19maWxlX2ZpbHRlcl9hZGRfbWltZV90eXBlIChwY2JfZmlsdGVyLCBmaWx0 ZXJfbWltZSk7CisgICAgICAgIHBpID0gMDsKKyAgICAgICAgd2hpbGUgKGZpbHRlcl9wYXR0ZXJu c1twaV0gIT0gMCApIHsKKyAgICAgICAgICBndGtfZmlsZV9maWx0ZXJfYWRkX3BhdHRlcm4gKHBj Yl9maWx0ZXIsIGZpbHRlcl9wYXR0ZXJuc1twaV0pOworICAgICAgICAgIHBpKys7CisgICAgICAg IH0KKyAgICAgICAgZ3RrX2ZpbGVfY2hvb3Nlcl9hZGRfZmlsdGVyIChHVEtfRklMRV9DSE9PU0VS IChkaWFsb2cpLCBwY2JfZmlsdGVyKTsKKyAgICAgIH0KKyAgICAgIGlkeCsrOworICAgIH0KKwor ICAgIC8vIE5vdyBhZGQgYWxsIHRoZSBvdGhlciBub24tZGVmYXVsdCBmb3JtYXRzCisgICAgaWR4 ID0gMDsKKyAgICB3aGlsZSAoaGlkX2dldF9maWxlX2Zvcm1hdChpZHgsIDAsICZpc19kZWZhdWx0 X2Zvcm1hdCwgJmZpbHRlcl9pZCwgJmZpbHRlcl9uYW1lLCAmZmlsdGVyX21pbWUsICZmaWx0ZXJf cGF0dGVybnMpKSB7CisgICAgICAgIGlmIChmaWx0ZXJfaWQgIT0gTlVMTCAmJiAoISBpc19kZWZh dWx0X2Zvcm1hdCkgKSB7CiAgICAgICAgICAgICBwY2JfZmlsdGVyID0gZ3RrX2ZpbGVfZmlsdGVy X25ldyAoKTsKICAgICAgICAgICAgIGd0a19maWxlX2ZpbHRlcl9zZXRfbmFtZSAocGNiX2ZpbHRl ciwgZmlsdGVyX25hbWUpOwogICAgICAgICAgICAgZ3RrX2ZpbGVfZmlsdGVyX2FkZF9taW1lX3R5 cGUgKHBjYl9maWx0ZXIsIGZpbHRlcl9taW1lKTsKZGlmZiAtLWdpdCBhL3NyYy9tYWluLmMgYi9z cmMvbWFpbi5jCmluZGV4IGNlOTUzNjEuLmY0Njc1NWUgMTAwNjQ0Ci0tLSBhL3NyYy9tYWluLmMK KysrIGIvc3JjL21haW4uYwpAQCAtMTk5NiwxMSArMTk5NiwxOCBAQCBtYWluIChpbnQgYXJnYywg Y2hhciAqYXJndltdKQogCiAgIGlmIChjb21tYW5kX2xpbmVfcGNiKQogICAgIHsKLSAgICAgIC8q IGtlZXAgZmlsZW5hbWUgZXZlbiBpZiBpbml0aWFsIGxvYWQgY29tbWFuZCBmYWlsZWQ7Ci0gICAg ICAgKiBmaWxlIG1pZ2h0IG5vdCBleGlzdAotICAgICAgICovCi0gICAgICBpZiAoTG9hZFBDQiAo Y29tbWFuZF9saW5lX3BjYikpCi0JUENCLT5GaWxlbmFtZSA9IHN0cmR1cCAoY29tbWFuZF9saW5l X3BjYik7CisgICAgICBpZiAoYWNjZXNzKGNvbW1hbmRfbGluZV9wY2IsIEZfT0spKQorICAgICAg ICB7CisJICAgLyogRmlsZSBkb2VzIG5vdCBleGlzdCwgc2F2ZSB0aGUgZmlsZW5hbWUgYW5kIGNv bnRpbnVlIHdpdGggZW1wdHkgYm9hcmQgKi8KKwkgICBQQ0ItPkZpbGVuYW1lID0gc3RyZHVwIChj b21tYW5kX2xpbmVfcGNiKTsKKwl9IGVsc2UgeworCSAgIC8qIEhhcmQgZmFpbCBpZiBmaWxlIGV4 aXN0cyBhbmQgZmFpbHMgdG8gbG9hZCAqLworICAgICAgICAgICBpZiAoTG9hZFBDQiAoY29tbWFu ZF9saW5lX3BjYikpCisgICAgICAgICAgICAgeworCSAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkxv YWRQQ0I6IEZhaWxlZCB0byBsb2FkIGV4aXN0aW5nIGZpbGUgXCIlc1wiLiBJcyBpdCBzdXBwb3J0 ZWQgUENCIGZpbGU/XG4iLCBjb21tYW5kX2xpbmVfcGNiKTsKKwkgICAgICAgZXhpdCgxKTsKKwkg ICAgIH0KKyAgICAgICAgfQogICAgIH0KIAogICBpZiAoU2V0dGluZ3MuSW5pdGlhbExheWVyU3Rh Y2sK --001a113d7c3eb950ce05297ccd05--