From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Wood Subject: [PATCH i-g-t 3/4] lib: remove handled option arguments from argv Date: Wed, 18 Feb 2015 17:06:15 +0000 Message-ID: <1424279176-5000-3-git-send-email-thomas.wood@intel.com> References: <1424279176-5000-1-git-send-email-thomas.wood@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by gabe.freedesktop.org (Postfix) with ESMTP id B6AD46E078 for ; Wed, 18 Feb 2015 09:06:21 -0800 (PST) Received: by wesx3 with SMTP id x3so2395521wes.7 for ; Wed, 18 Feb 2015 09:06:21 -0800 (PST) In-Reply-To: <1424279176-5000-1-git-send-email-thomas.wood@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UmVtb3ZlIG9wdGlvbnMgZnJvbSBhcmd2IHRoYXQgaGF2ZSBiZWVuIGhhbmRsZWQgYnkgZ2V0b3B0 IHRvIGFsbG93CmFkZGl0aW9uYWwgbm9uLW9wdGlvbiBwYXJhbWV0ZXJzIHRvIGJlIHByb2Nlc3Nl ZCBpbiB0aGUgdGVzdCBhcHBsaWNhdGlvbi4KClRoaXMgZml4ZXMgaXNzdWVzIHdoZW4gdXNpbmcg b3B0aW9ucyBzdWNoIGFzIC0tZGVidWcgd2l0aCB0ZXN0cyB0aGF0IGFjY2VwdAphZGRpdGlvbmFs IG5vbi1vcHRpb24gcGFyYW1ldGVycy4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBXb29kIDx0aG9t YXMud29vZEBpbnRlbC5jb20+Ci0tLQogbGliL2lndF9jb3JlLmMgICAgICAgICAgICAgICAgICAg IHwgMTMgKysrKysrKysrLS0tLQogbGliL2lndF9jb3JlLmggICAgICAgICAgICAgICAgICAgIHwg MTIgKysrKysrLS0tLS0tCiBsaWIvdGVzdHMvaWd0X2xpc3Rfb25seS5jICAgICAgICAgfCAgMyAr Ky0KIGxpYi90ZXN0cy9pZ3Rfbm9fZXhpdC5jICAgICAgICAgICB8ICAzICsrLQogbGliL3Rlc3Rz L2lndF9ub19leGl0X2xpc3Rfb25seS5jIHwgIDMgKystCiBsaWIvdGVzdHMvaWd0X25vX3N1YnRl c3QuYyAgICAgICAgfCAgMyArKy0KIGxpYi90ZXN0cy9pZ3Rfc2ltdWxhdGlvbi5jICAgICAgICB8 IDE1ICsrKysrKysrKystLS0tLQogdGVzdHMvZ2VtX2N0eF9iYXNpYy5jICAgICAgICAgICAgIHwg IDIgKy0KIHRlc3RzL2dlbV9yZW5kZXJfY29weS5jICAgICAgICAgICB8ICAyICstCiB0ZXN0cy9n ZW1fc2Vxbm9fd3JhcC5jICAgICAgICAgICAgfCAgMiArLQogdGVzdHMvZ2VtX3N0cmVzcy5jICAg ICAgICAgICAgICAgIHwgIDIgKy0KIHRlc3RzL2ttc19wc3Jfc2lua19jcmMuYyAgICAgICAgICB8 ICAyICstCiB0ZXN0cy9rbXNfc2V0bW9kZS5jICAgICAgICAgICAgICAgfCAgMiArLQogdGVzdHMv cG1fcnBtLmMgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIDE0IGZpbGVzIGNoYW5nZWQsIDQw IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfY29y ZS5jIGIvbGliL2lndF9jb3JlLmMKaW5kZXggYWZlY2RmMS4uNzViOThmNiAxMDA2NDQKLS0tIGEv bGliL2lndF9jb3JlLmMKKysrIGIvbGliL2lndF9jb3JlLmMKQEAgLTQ4Nyw3ICs0ODcsNyBAQCBz dGF0aWMgdm9pZCBvb21fYWRqdXN0X2Zvcl9kb29tKHZvaWQpCiAJbG93X21lbV9raWxsZXJfZGlz YWJsZSh0cnVlKTsKIH0KIAotc3RhdGljIGludCBjb21tb25faW5pdChpbnQgYXJnYywgY2hhciAq KmFyZ3YsCitzdGF0aWMgaW50IGNvbW1vbl9pbml0KGludCAqYXJnYywgY2hhciAqKmFyZ3YsCiAJ CSAgICAgICBjb25zdCBjaGFyICpleHRyYV9zaG9ydF9vcHRzLAogCQkgICAgICAgc3RydWN0IG9w dGlvbiAqZXh0cmFfbG9uZ19vcHRzLAogCQkgICAgICAgY29uc3QgY2hhciAqaGVscF9zdHIsCkBA IC01ODIsNyArNTgyLDcgQEAgc3RhdGljIGludCBjb21tb25faW5pdChpbnQgYXJnYywgY2hhciAq KmFyZ3YsCiAJCSAgICAgICBzdGRfc2hvcnRfb3B0cyk7CiAJYXNzZXJ0KHJldCA+PSAwKTsKIAot CXdoaWxlICgoYyA9IGdldG9wdF9sb25nKGFyZ2MsIGFyZ3YsIHNob3J0X29wdHMsIGNvbWJpbmVk X29wdHMsCisJd2hpbGUgKChjID0gZ2V0b3B0X2xvbmcoKmFyZ2MsIGFyZ3YsIHNob3J0X29wdHMs IGNvbWJpbmVkX29wdHMsCiAJCQkgICAgICAgJm9wdGlvbl9pbmRleCkpICE9IC0xKSB7CiAJCXN3 aXRjaChjKSB7CiAJCWNhc2UgT1BUX0lOVEVSQUNUSVZFX0RFQlVHOgpAQCAtNjU1LDYgKzY1NSwx MSBAQCBvdXQ6CiAJaWYgKCF0ZXN0X3dpdGhfc3VidGVzdHMpCiAJCWdldHRpbWUoJnN1YnRlc3Rf dGltZSk7CiAKKwlmb3IgKGkgPSAwOyAob3B0aW5kICsgaSkgPCAqYXJnYzsgaSsrKQorCQlhcmd2 W2kgKyAxXSA9IGFyZ3Zbb3B0aW5kICsgaV07CisKKwkqYXJnYyA9ICphcmdjIC0gb3B0aW5kICsg MTsKKwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTY3OCw3ICs2ODMsNyBAQCBvdXQ6CiAgKgogICog UmV0dXJuczogRm9yd2FyZHMgYW55IG9wdGlvbiBwYXJzaW5nIGVycm9ycyBmcm9tIGdldG9wdF9s b25nLgogICovCi1pbnQgaWd0X3N1YnRlc3RfaW5pdF9wYXJzZV9vcHRzKGludCBhcmdjLCBjaGFy ICoqYXJndiwKK2ludCBpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoaW50ICphcmdjLCBjaGFy ICoqYXJndiwKIAkJCQljb25zdCBjaGFyICpleHRyYV9zaG9ydF9vcHRzLAogCQkJCXN0cnVjdCBv cHRpb24gKmV4dHJhX2xvbmdfb3B0cywKIAkJCQljb25zdCBjaGFyICpoZWxwX3N0ciwKQEAgLTcw Nyw3ICs3MTIsNyBAQCBlbnVtIGlndF9sb2dfbGV2ZWwgaWd0X2xvZ19sZXZlbCA9IElHVF9MT0df SU5GTzsKICAqIFRoaXMgaW5pdGlhbGl6ZXMgYSBzaW1wbGUgdGVzdCB3aXRob3V0IGFueSBzdXBw b3J0IGZvciBzdWJ0ZXN0cyBhbmQgYWxsb3dzCiAgKiBhbiBhcmJpdHJhcnkgc2V0IG9mIGFkZGl0 aW9uYWwgb3B0aW9ucy4KICAqLwotdm9pZCBpZ3Rfc2ltcGxlX2luaXRfcGFyc2Vfb3B0cyhpbnQg YXJnYywgY2hhciAqKmFyZ3YsCit2b2lkIGlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKGludCAq YXJnYywgY2hhciAqKmFyZ3YsCiAJCQkJY29uc3QgY2hhciAqZXh0cmFfc2hvcnRfb3B0cywKIAkJ CQlzdHJ1Y3Qgb3B0aW9uICpleHRyYV9sb25nX29wdHMsCiAJCQkJY29uc3QgY2hhciAqaGVscF9z dHIsCmRpZmYgLS1naXQgYS9saWIvaWd0X2NvcmUuaCBiL2xpYi9pZ3RfY29yZS5oCmluZGV4IDg4 YjQ3YmYuLmUxODMzY2YgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY29yZS5oCisrKyBiL2xpYi9pZ3Rf Y29yZS5oCkBAIC0xMTAsNyArMTEwLDcgQEAgdHlwZWRlZiBpbnQgKCppZ3Rfb3B0X2hhbmRsZXJf dCkoaW50IG9wdCwgaW50IG9wdF9pbmRleCk7CiAjaWZuZGVmIF9fR1RLX0RPQ19JR05PUkVfXyAv KiBndGtkb2Mgd2FudHMgdG8gZG9jdW1lbnQgdGhpcyBmb3J3YXJkIGRlY2wgKi8KIHN0cnVjdCBv cHRpb247CiAjZW5kaWYKLWludCBpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoaW50IGFyZ2Ms IGNoYXIgKiphcmd2LAoraW50IGlndF9zdWJ0ZXN0X2luaXRfcGFyc2Vfb3B0cyhpbnQgKmFyZ2Ms IGNoYXIgKiphcmd2LAogCQkJCWNvbnN0IGNoYXIgKmV4dHJhX3Nob3J0X29wdHMsCiAJCQkJc3Ry dWN0IG9wdGlvbiAqZXh0cmFfbG9uZ19vcHRzLAogCQkJCWNvbnN0IGNoYXIgKmhlbHBfc3RyLApA QCAtMTMwLDcgKzEzMCw3IEBAIGludCBpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoaW50IGFy Z2MsIGNoYXIgKiphcmd2LAogICogI2lndF9tYWluIGJsb2NrIGluc3RlYWQgb2Ygc3RpdGNoaW5n IHRoZSB0ZXN0J3MgbWFpbigpIGZ1bmN0aW9uIHRvZ2V0aGVyCiAgKiBtYW51YWxseS4KICAqLwot I2RlZmluZSBpZ3Rfc3VidGVzdF9pbml0KGFyZ2MsIGFyZ3YpIGlndF9zdWJ0ZXN0X2luaXRfcGFy c2Vfb3B0cyhhcmdjLCBhcmd2LCBOVUxMLCBOVUxMLCBOVUxMLCBOVUxMKTsKKyNkZWZpbmUgaWd0 X3N1YnRlc3RfaW5pdChhcmdjLCBhcmd2KSBpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoJmFy Z2MsIGFyZ3YsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOwogCiBib29sIF9faWd0X3J1bl9zdWJ0 ZXN0KGNvbnN0IGNoYXIgKnN1YnRlc3RfbmFtZSk7CiAjZGVmaW5lIF9faWd0X3Rva2VuY2F0Mih4 LCB5KSB4ICMjIHkKQEAgLTE5NSwxNCArMTk1LDE0IEBAIGJvb2wgaWd0X29ubHlfbGlzdF9zdWJ0 ZXN0cyh2b2lkKTsKICNkZWZpbmUgaWd0X21haW4gXAogCXN0YXRpYyB2b2lkIGlndF90b2tlbmNh dChfX3JlYWxfbWFpbiwgX19MSU5FX18pKHZvaWQpOyBcCiAJaW50IG1haW4oaW50IGFyZ2MsIGNo YXIgKiphcmd2KSB7IFwKLQkJaWd0X3N1YnRlc3RfaW5pdF9wYXJzZV9vcHRzKGFyZ2MsIGFyZ3Ys IE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOyBcCisJCWlndF9zdWJ0ZXN0X2luaXRfcGFyc2Vfb3B0 cygmYXJnYywgYXJndiwgTlVMTCwgTlVMTCwgTlVMTCwgTlVMTCk7IFwKIAkJaWd0X3Rva2VuY2F0 KF9fcmVhbF9tYWluLCBfX0xJTkVfXykoKTsgXAogCQlpZ3RfZXhpdCgpOyBcCiAJfSBcCiAJc3Rh dGljIHZvaWQgaWd0X3Rva2VuY2F0KF9fcmVhbF9tYWluLCBfX0xJTkVfXykodm9pZCkgXAogCiAK LXZvaWQgaWd0X3NpbXBsZV9pbml0X3BhcnNlX29wdHMoaW50IGFyZ2MsIGNoYXIgKiphcmd2LAor dm9pZCBpZ3Rfc2ltcGxlX2luaXRfcGFyc2Vfb3B0cyhpbnQgKmFyZ2MsIGNoYXIgKiphcmd2LAog CQkJCWNvbnN0IGNoYXIgKmV4dHJhX3Nob3J0X29wdHMsCiAJCQkJc3RydWN0IG9wdGlvbiAqZXh0 cmFfbG9uZ19vcHRzLAogCQkJCWNvbnN0IGNoYXIgKmhlbHBfc3RyLApAQCAtMjE5LDcgKzIxOSw3 IEBAIHZvaWQgaWd0X3NpbXBsZV9pbml0X3BhcnNlX29wdHMoaW50IGFyZ2MsIGNoYXIgKiphcmd2 LAogICogI2lndF9zaW1wbGVfbWFpbiBibG9jayBpbnN0ZWFkIG9mIHN0aXRjaGluZyB0aGUgdGVz dCdzIG1haW4oKSBmdW5jdGlvbiB0b2dldGhlcgogICogbWFudWFsbHkuCiAgKi8KLSNkZWZpbmUg aWd0X3NpbXBsZV9pbml0KGFyZ2MsIGFyZ3YpIGlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKGFy Z2MsIGFyZ3YsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOworI2RlZmluZSBpZ3Rfc2ltcGxlX2lu aXQoYXJnYywgYXJndikgaWd0X3NpbXBsZV9pbml0X3BhcnNlX29wdHMoJmFyZ2MsIGFyZ3YsIE5V TEwsIE5VTEwsIE5VTEwsIE5VTEwpOwogCiAvKioKICAqIGlndF9zaW1wbGVfbWFpbjoKQEAgLTIz MSw3ICsyMzEsNyBAQCB2b2lkIGlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKGludCBhcmdjLCBj aGFyICoqYXJndiwKICNkZWZpbmUgaWd0X3NpbXBsZV9tYWluIFwKIAlzdGF0aWMgdm9pZCBpZ3Rf dG9rZW5jYXQoX19yZWFsX21haW4sIF9fTElORV9fKSh2b2lkKTsgXAogCWludCBtYWluKGludCBh cmdjLCBjaGFyICoqYXJndikgeyBcCi0JCWlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKGFyZ2Ms IGFyZ3YsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOyBcCisJCWlndF9zaW1wbGVfaW5pdF9wYXJz ZV9vcHRzKCZhcmdjLCBhcmd2LCBOVUxMLCBOVUxMLCBOVUxMLCBOVUxMKTsgXAogCQlpZ3RfdG9r ZW5jYXQoX19yZWFsX21haW4sIF9fTElORV9fKSgpOyBcCiAJCWlndF9leGl0KCk7IFwKIAl9IFwK ZGlmZiAtLWdpdCBhL2xpYi90ZXN0cy9pZ3RfbGlzdF9vbmx5LmMgYi9saWIvdGVzdHMvaWd0X2xp c3Rfb25seS5jCmluZGV4IGQzZWE4YzIuLjY1ZmE5ZGEgMTAwNjQ0Ci0tLSBhL2xpYi90ZXN0cy9p Z3RfbGlzdF9vbmx5LmMKKysrIGIvbGliL3Rlc3RzL2lndF9saXN0X29ubHkuYwpAQCAtMzIsOCAr MzIsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJY2hhciBwcm9nW10gPSAi aWd0X2xpc3Rfb25seSI7CiAJY2hhciBhcmdbXSA9ICItLWxpc3Qtc3VidGVzdHMiOwogCWNoYXIg KmZha2VfYXJndltdID0ge3Byb2csIGFyZ307CisJaW50IGZha2VfYXJnYyA9IDI7CiAKLQlpZ3Rf c3VidGVzdF9pbml0KDIsIGZha2VfYXJndik7CisJaWd0X3N1YnRlc3RfaW5pdChmYWtlX2FyZ2Ms IGZha2VfYXJndik7CiAKIAlpZ3Rfc3VidGVzdCgiQSIpCiAJCTsKZGlmZiAtLWdpdCBhL2xpYi90 ZXN0cy9pZ3Rfbm9fZXhpdC5jIGIvbGliL3Rlc3RzL2lndF9ub19leGl0LmMKaW5kZXggYmEzZmFl MC4uZGM4OWI4MyAxMDA2NDQKLS0tIGEvbGliL3Rlc3RzL2lndF9ub19leGl0LmMKKysrIGIvbGli L3Rlc3RzL2lndF9ub19leGl0LmMKQEAgLTMxLDggKzMxLDkgQEAgaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIgKiphcmd2KQogewogCWNoYXIgcHJvZ1tdID0gImlndF9ub19leGl0IjsKIAljaGFyICpm YWtlX2FyZ3ZbXSA9IHtwcm9nfTsKKwlpbnQgZmFrZV9hcmdjID0gMTsKIAotCWlndF9zdWJ0ZXN0 X2luaXQoMSwgZmFrZV9hcmd2KTsKKwlpZ3Rfc3VidGVzdF9pbml0KGZha2VfYXJnYywgZmFrZV9h cmd2KTsKIAogCWlndF9zdWJ0ZXN0KCJBIikKIAkJOwpkaWZmIC0tZ2l0IGEvbGliL3Rlc3RzL2ln dF9ub19leGl0X2xpc3Rfb25seS5jIGIvbGliL3Rlc3RzL2lndF9ub19leGl0X2xpc3Rfb25seS5j CmluZGV4IDNiMjMyYmUuLmFkZDNmYzIgMTAwNjQ0Ci0tLSBhL2xpYi90ZXN0cy9pZ3Rfbm9fZXhp dF9saXN0X29ubHkuYworKysgYi9saWIvdGVzdHMvaWd0X25vX2V4aXRfbGlzdF9vbmx5LmMKQEAg LTMyLDggKzMyLDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCWNoYXIgcHJv Z1tdID0gImlndF9saXN0X29ubHkiOwogCWNoYXIgYXJnW10gPSAiLS1saXN0LXN1YnRlc3RzIjsK IAljaGFyICpmYWtlX2FyZ3ZbXSA9IHtwcm9nLCBhcmd9OworCWludCBmYWtlX2FyZ2MgPSAyOwog Ci0JaWd0X3N1YnRlc3RfaW5pdCgyLCBmYWtlX2FyZ3YpOworCWlndF9zdWJ0ZXN0X2luaXQoZmFr ZV9hcmdjLCBmYWtlX2FyZ3YpOwogCiAJaWd0X3N1YnRlc3QoIkEiKQogCQk7CmRpZmYgLS1naXQg YS9saWIvdGVzdHMvaWd0X25vX3N1YnRlc3QuYyBiL2xpYi90ZXN0cy9pZ3Rfbm9fc3VidGVzdC5j CmluZGV4IDQ3ZjE1ZmMuLjFhZTYyY2YgMTAwNjQ0Ci0tLSBhL2xpYi90ZXN0cy9pZ3Rfbm9fc3Vi dGVzdC5jCisrKyBiL2xpYi90ZXN0cy9pZ3Rfbm9fc3VidGVzdC5jCkBAIC0zMSw4ICszMSw5IEBA IGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIHsKIAljaGFyIHByb2dbXSA9ICJpZ3Rf bm9fZXhpdCI7CiAJY2hhciAqZmFrZV9hcmd2W10gPSB7cHJvZ307CisJaW50IGZha2VfYXJnYyA9 IDE7CiAKLQlpZ3Rfc3VidGVzdF9pbml0KDEsIGZha2VfYXJndik7CisJaWd0X3N1YnRlc3RfaW5p dChmYWtlX2FyZ2MsIGZha2VfYXJndik7CiAKIAlpZ3RfZXhpdCgpOwogfQpkaWZmIC0tZ2l0IGEv bGliL3Rlc3RzL2lndF9zaW11bGF0aW9uLmMgYi9saWIvdGVzdHMvaWd0X3NpbXVsYXRpb24uYwpp bmRleCBlNTg4OTU5Li4zMjgzMGJhIDEwMDY0NAotLS0gYS9saWIvdGVzdHMvaWd0X3NpbXVsYXRp b24uYworKysgYi9saWIvdGVzdHMvaWd0X3NpbXVsYXRpb24uYwpAQCAtNTUsMjIgKzU1LDI3IEBA IGNoYXIgKmFyZ3ZfcnVuW10gPSB7IHRlc3QgfTsKIHN0YXRpYyBpbnQgZG9fZm9yayh2b2lkKQog ewogCWludCBwaWQsIHN0YXR1czsKKwlpbnQgYXJnYzsKIAogCXN3aXRjaCAocGlkID0gZm9yaygp KSB7CiAJY2FzZSAtMToKIAkJaW50ZXJuYWxfYXNzZXJ0KDApOwogCWNhc2UgMDoKIAkJaWYgKHNp bXBsZSkgewotCQkJaWd0X3NpbXBsZV9pbml0KDEsIGFyZ3ZfcnVuKTsKKwkJCWFyZ2MgPSAxOwor CQkJaWd0X3NpbXBsZV9pbml0KGFyZ2MsIGFyZ3ZfcnVuKTsKIAogCQkJaWd0X3NraXBfb25fc2lt dWxhdGlvbigpOwogCiAJCQlpZ3RfZXhpdCgpOwogCQl9IGVsc2UgewotCQkJaWYgKGxpc3Rfc3Vi dGVzdHMpCi0JCQkJaWd0X3N1YnRlc3RfaW5pdCgyLCBhcmd2X2xpc3QpOwotCQkJZWxzZQotCQkJ CWlndF9zdWJ0ZXN0X2luaXQoMSwgYXJndl9ydW4pOworCQkJaWYgKGxpc3Rfc3VidGVzdHMpIHsK KwkJCQlhcmdjID0gMjsKKwkJCQlpZ3Rfc3VidGVzdF9pbml0KGFyZ2MsIGFyZ3ZfbGlzdCk7CisJ CQl9IGVsc2UgeworCQkJCWFyZ2MgPSAxOworCQkJCWlndF9zdWJ0ZXN0X2luaXQoYXJnYywgYXJn dl9ydW4pOworCQkJfQogCiAJCQlpZiAoaW5fZml4dHVyZSkgewogCQkJCWlndF9maXh0dXJlCmRp ZmYgLS1naXQgYS90ZXN0cy9nZW1fY3R4X2Jhc2ljLmMgYi90ZXN0cy9nZW1fY3R4X2Jhc2ljLmMK aW5kZXggMmQ4NjZiMy4uNDMwMWIzNCAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX2N0eF9iYXNpYy5j CisrKyBiL3Rlc3RzL2dlbV9jdHhfYmFzaWMuYwpAQCAtMTQ0LDcgKzE0NCw3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CiAJaW50IGk7CiAKLQlpZ3Rfc2ltcGxlX2luaXRf cGFyc2Vfb3B0cyhhcmdjLCBhcmd2LCAiaTpjOm46bXUiLCBOVUxMLCBOVUxMLAorCWlndF9zaW1w bGVfaW5pdF9wYXJzZV9vcHRzKCZhcmdjLCBhcmd2LCAiaTpjOm46bXUiLCBOVUxMLCBOVUxMLAog CQkJCSAgIG9wdF9oYW5kbGVyKTsKIAogCWZkID0gZHJtX29wZW5fYW55X3JlbmRlcigpOwpkaWZm IC0tZ2l0IGEvdGVzdHMvZ2VtX3JlbmRlcl9jb3B5LmMgYi90ZXN0cy9nZW1fcmVuZGVyX2NvcHku YwppbmRleCA2MzQ4ZWVlLi5kZjFhYzg4IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fcmVuZGVyX2Nv cHkuYworKysgYi90ZXN0cy9nZW1fcmVuZGVyX2NvcHkuYwpAQCAtMTQxLDcgKzE0MSw3IEBAIGlu dCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAlpZ3RfcmVuZGVyX2NvcHlmdW5jX3QgcmVu ZGVyX2NvcHkgPSBOVUxMOwogCWludCBvcHRfZHVtcF9hdWIgPSBpZ3RfYXViX2R1bXBfZW5hYmxl ZCgpOwogCi0JaWd0X3NpbXBsZV9pbml0X3BhcnNlX29wdHMoYXJnYywgYXJndiwgImRhIiwgTlVM TCwgTlVMTCwgb3B0X2hhbmRsZXIpOworCWlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKCZhcmdj LCBhcmd2LCAiZGEiLCBOVUxMLCBOVUxMLCBvcHRfaGFuZGxlcik7CiAKIAlpZ3RfZml4dHVyZSB7 CiAJCWRhdGEuZHJtX2ZkID0gZHJtX29wZW5fYW55X3JlbmRlcigpOwpkaWZmIC0tZ2l0IGEvdGVz dHMvZ2VtX3NlcW5vX3dyYXAuYyBiL3Rlc3RzL2dlbV9zZXFub193cmFwLmMKaW5kZXggZDA3ZWM5 Ni4uYmE1OGViZCAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX3NlcW5vX3dyYXAuYworKysgYi90ZXN0 cy9nZW1fc2Vxbm9fd3JhcC5jCkBAIC01MDMsNyArNTAzLDcgQEAgaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIgKiphcmd2KQogCW9wdGlvbnMucHJld3JhcF9zcGFjZSA9IDIxOwogCW9wdGlvbnMuYnVm ZmVycyA9IDEwOwogCi0JaWd0X3NpbXBsZV9pbml0X3BhcnNlX29wdHMoYXJnYywgYXJndiwgIm46 YnZ0OmRwOnJpOiIsIGxvbmdfb3B0aW9ucywKKwlpZ3Rfc2ltcGxlX2luaXRfcGFyc2Vfb3B0cygm YXJnYywgYXJndiwgIm46YnZ0OmRwOnJpOiIsIGxvbmdfb3B0aW9ucywKIAkJCQkgICBoZWxwLCBw YXJzZV9vcHRpb25zKTsKIAogCWNhcmRfaW5kZXggPSBkcm1fZ2V0X2NhcmQoKTsKZGlmZiAtLWdp dCBhL3Rlc3RzL2dlbV9zdHJlc3MuYyBiL3Rlc3RzL2dlbV9zdHJlc3MuYwppbmRleCBmNjg3YjJk Li5jYjk1MWFmIDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fc3RyZXNzLmMKKysrIGIvdGVzdHMvZ2Vt X3N0cmVzcy5jCkBAIC04NTQsNyArODU0LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiph cmd2KQogCW9wdGlvbnMudGlsZXNfcGVyX2J1ZiA9IG9wdGlvbnMuc2NyYXRjaF9idWZfc2l6ZSAv IFRJTEVfQllURVMob3B0aW9ucy50aWxlX3NpemUpOwogCW9wdGlvbnMuY2hlY2tfcmVuZGVyX2Nw eWZuID0gMDsKIAotCWlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKGFyZ2MsIGFyZ3YsImRzOmc6 Yzp0OnJidXhtbzpmcDoiLAorCWlndF9zaW1wbGVfaW5pdF9wYXJzZV9vcHRzKCZhcmdjLCBhcmd2 LCJkczpnOmM6dDpyYnV4bW86ZnA6IiwKIAkJCQkgICBsb25nX29wdGlvbnMsIE5VTEwsIHBhcnNl X29wdGlvbnMpOwogCiAJZHJtX2ZkID0gZHJtX29wZW5fYW55KCk7CmRpZmYgLS1naXQgYS90ZXN0 cy9rbXNfcHNyX3NpbmtfY3JjLmMgYi90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKaW5kZXggOThi NjBjZi4uOTI1NjY0MCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3Bzcl9zaW5rX2NyYy5jCisrKyBi L3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYwpAQCAtNDg5LDcgKzQ4OSw3IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAJZGF0YV90IGRhdGEgPSB7fTsKIAllbnVtIG9wZXJhdGlv bnMgb3A7CiAKLQlpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoYXJnYywgYXJndiwgIiIsIGxv bmdfb3B0aW9ucywKKwlpZ3Rfc3VidGVzdF9pbml0X3BhcnNlX29wdHMoJmFyZ2MsIGFyZ3YsICIi LCBsb25nX29wdGlvbnMsCiAJCQkJICAgIGhlbHBfc3RyLCBvcHRfaGFuZGxlcik7CiAJaWd0X3Nr aXBfb25fc2ltdWxhdGlvbigpOwogCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfc2V0bW9kZS5jIGIv dGVzdHMva21zX3NldG1vZGUuYwppbmRleCBmMTM4NzFlLi44ZTZhZmJmIDEwMDY0NAotLS0gYS90 ZXN0cy9rbXNfc2V0bW9kZS5jCisrKyBiL3Rlc3RzL2ttc19zZXRtb2RlLmMKQEAgLTY5OSw3ICs2 OTksNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJaW50IGk7CiAJaW50IHJl dDsKIAotCXJldCA9IGlndF9zdWJ0ZXN0X2luaXRfcGFyc2Vfb3B0cyhhcmdjLCBhcmd2LCAiZHQ6 IiwgTlVMTCwgaGVscF9zdHIsCisJcmV0ID0gaWd0X3N1YnRlc3RfaW5pdF9wYXJzZV9vcHRzKCZh cmdjLCBhcmd2LCAiZHQ6IiwgTlVMTCwgaGVscF9zdHIsCiAJCQkJCSAgb3B0X2hhbmRsZXIpOwog CWlmIChyZXQgPCAwKQogCQlyZXR1cm4gcmV0ID09IC0xID8gMCA6IHJldDsKZGlmZiAtLWdpdCBh L3Rlc3RzL3BtX3JwbS5jIGIvdGVzdHMvcG1fcnBtLmMKaW5kZXggODQyNTRiNy4uYzI4NDdkMCAx MDA2NDQKLS0tIGEvdGVzdHMvcG1fcnBtLmMKKysrIGIvdGVzdHMvcG1fcnBtLmMKQEAgLTE4MTEs NyArMTgxMSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCXsgMCwgMCwg MCwgMCB9CiAJfTsKIAotCWlndF9zdWJ0ZXN0X2luaXRfcGFyc2Vfb3B0cyhhcmdjLCBhcmd2LCAi IiwgbG9uZ19vcHRpb25zLAorCWlndF9zdWJ0ZXN0X2luaXRfcGFyc2Vfb3B0cygmYXJnYywgYXJn diwgIiIsIGxvbmdfb3B0aW9ucywKIAkJCQkgICAgaGVscF9zdHIsIG9wdF9oYW5kbGVyKTsKIAog CS8qIFNraXAgaW5zdGVhZCBvZiBmYWlsaW5nIGluIGNhc2UgdGhlIG1hY2hpbmUgaXMgbm90IHBy ZXBhcmVkIHRvIHJlYWNoCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK