From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26725 invoked by alias); 28 Feb 2011 07:58:24 -0000 Received: (qmail 26717 invoked by uid 22791); 28 Feb 2011 07:58:22 -0000 X-SWARE-Spam-Status: No, hits=0.3 required=5.0 tests=AWL,BAYES_50,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST X-Spam-Check-By: sourceware.org Received: from mail-qw0-f41.google.com (HELO mail-qw0-f41.google.com) (209.85.216.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 28 Feb 2011 07:58:17 +0000 Received: by qwd7 with SMTP id 7so3308955qwd.0 for ; Sun, 27 Feb 2011 23:58:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.183.193 with SMTP id ch1mr3990480qcb.107.1298879895432; Sun, 27 Feb 2011 23:58:15 -0800 (PST) Received: by 10.229.89.197 with HTTP; Sun, 27 Feb 2011 23:58:15 -0800 (PST) Date: Mon, 28 Feb 2011 07:58:00 -0000 Message-ID: Subject: [patch binutils gas]: Let binutils understand DOS-paths (2 of 4) From: Kai Tietz To: Binutils , Nick Clifton Cc: Dave Korn Content-Type: multipart/mixed; boundary=001485f78ec2c5edf5049d530ac1 X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-02/txt/msg00392.txt.bz2 --001485f78ec2c5edf5049d530ac1 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 963 Hello, ChangeLog binutils/ 2011-02-28 Kai Tietz * debug.c (debug_start_source): Use filename_(n)cmp. * ieee.c (ieee_finish_compilation_unit): Likewise. (ieee_lineno): Likewise. * nlmconv.c (main): Likewise. * objcopy.c (strip_main): Likewise. (copy_main): Likewise. * objdump.c (show_line): Likewise. (dump_reloc_set): Likewise. * srconv.c (main): Likewise. * wrstabs.c (stab_lineno): Likewise. ChangeLog gas/ 2011-02-28 Kai Tietz * depend.c (register_dependency): Use filename_(n)cmp. * dwarf2dbg.c (get_filenum): Likewise. * ecoff.c (add_file): Likewise. (ecoff_generate_asm_lineno): Likewise. * input-scrub.c (new_logical_line_flags): Likewise. * listing.c (file_info): Likewise. (listing_newline): Likewise. * remap.c (remap_debug_filename): Likewise. * stabs.c (generate_asm_file): Likewise. (stabs_generate_asm_lineno): Likewise. Tested for x86_64-w64-mingw32, i686-pc-cygwin, and x86_64-pc-linux-gnu. Ok for apply? Regards, Kai --001485f78ec2c5edf5049d530ac1 Content-Type: text/plain; charset=US-ASCII; name="binutils_filecmp_02.txt" Content-Disposition: attachment; filename="binutils_filecmp_02.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gkp3jrjv0 Content-length: 18386 SW5kZXg6IHNyYy9iaW51dGlscy9kZWJ1Zy5jCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIHNyYy5vcmlnL2JpbnV0aWxzL2RlYnVnLmMJMjAxMS0wMi0y NiAyMzowNjo1NC45NTc5MDkxMDAgKzAxMDAKKysrIHNyYy9iaW51dGlscy9k ZWJ1Zy5jCTIwMTEtMDItMjcgMTI6MDg6NDguMDMxOTg2MjAwICswMTAwCkBA IC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8YXNzZXJ0Lmg+CiAjaW5jbHVk ZSAiYmZkLmgiCiAjaW5jbHVkZSAibGliaWJlcnR5LmgiCisjaW5jbHVkZSAi ZmlsZW5hbWVzLmgiCiAjaW5jbHVkZSAiZGVidWcuaCIKIAogLyogR2xvYmFs IGluZm9ybWF0aW9uIHdlIGtlZXAgZm9yIGRlYnVnZ2luZy4gIEEgcG9pbnRl ciB0byB0aGlzCkBAIC03MjksOSArNzMwLDcgQEAgZGVidWdfc3RhcnRfc291 cmNlICh2b2lkICpoYW5kbGUsIGNvbnN0CiAKICAgZm9yIChmID0gaW5mby0+ Y3VycmVudF91bml0LT5maWxlczsgZiAhPSBOVUxMOyBmID0gZi0+bmV4dCkK ICAgICB7Ci0gICAgICBpZiAoZi0+ZmlsZW5hbWVbMF0gPT0gbmFtZVswXQot CSAgJiYgZi0+ZmlsZW5hbWVbMV0gPT0gbmFtZVsxXQotCSAgJiYgc3RyY21w IChmLT5maWxlbmFtZSwgbmFtZSkgPT0gMCkKKyAgICAgIGlmIChmaWxlbmFt ZV9jbXAgKGYtPmZpbGVuYW1lLCBuYW1lKSA9PSAwKQogCXsKIAkgIGluZm8t PmN1cnJlbnRfZmlsZSA9IGY7CiAJICByZXR1cm4gVFJVRTsKSW5kZXg6IHNy Yy9iaW51dGlscy9pZWVlLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g c3JjLm9yaWcvYmludXRpbHMvaWVlZS5jCTIwMTEtMDItMjYgMjM6MDY6NTQu OTU5OTA5MTAwICswMTAwCisrKyBzcmMvYmludXRpbHMvaWVlZS5jCTIwMTEt MDItMjcgMTI6MDg6NDguMDU0OTg3NTAwICswMTAwCkBAIC00OTM4LDcgKzQ5 MzgsNyBAQCBpZWVlX2ZpbmlzaF9jb21waWxhdGlvbl91bml0IChzdHJ1Y3Qg aWVlCiAgICAgICBpZiAoISBpZWVlX2NoYW5nZV9idWZmZXIgKGluZm8sICZp bmZvLT5saW5lbm9zKQogCSAgfHwgISBpZWVlX3dyaXRlX2J5dGUgKGluZm8s IChpbnQpIGllZWVfYmVfcmVjb3JkX2VudW0pKQogCXJldHVybiBGQUxTRTsK LSAgICAgIGlmIChzdHJjbXAgKGluZm8tPmZpbGVuYW1lLCBpbmZvLT5saW5l bm9fZmlsZW5hbWUpICE9IDApCisgICAgICBpZiAoZmlsZW5hbWVfY21wIChp bmZvLT5maWxlbmFtZSwgaW5mby0+bGluZW5vX2ZpbGVuYW1lKSAhPSAwKQog CXsKIAkgIC8qIFdlIHdlcmUgbm90IGluIHRoZSBtYWluIGZpbGUuICBXZSBq dXN0IGNsb3NlZCB0aGUKICAgICAgICAgICAgICBpbmNsdWRlZCBsaW5lIG51 bWJlciBibG9jaywgYW5kIG5vdyB3ZSBtdXN0IGNsb3NlIHRoZQpAQCAtNzMz OSwxNSArNzMzOSwxNyBAQCBpZWVlX2xpbmVubyAodm9pZCAqcCwgY29uc3Qg Y2hhciAqZmlsZW5hCiAJICBpbmZvLT5saW5lbm9fZmlsZW5hbWUgPSBpbmZv LT5maWxlbmFtZTsKIAl9CiAKLSAgICAgIGlmIChzdHJjbXAgKGluZm8tPnBl bmRpbmdfbGluZW5vX2ZpbGVuYW1lLCBpbmZvLT5saW5lbm9fZmlsZW5hbWUp ICE9IDApCisgICAgICBpZiAoZmlsZW5hbWVfY21wIChpbmZvLT5wZW5kaW5n X2xpbmVub19maWxlbmFtZSwKKwkJCWluZm8tPmxpbmVub19maWxlbmFtZSkg IT0gMCkKIAl7Ci0JICBpZiAoc3RyY21wIChpbmZvLT5maWxlbmFtZSwgaW5m by0+bGluZW5vX2ZpbGVuYW1lKSAhPSAwKQorCSAgaWYgKGZpbGVuYW1lX2Nt cCAoaW5mby0+ZmlsZW5hbWUsIGluZm8tPmxpbmVub19maWxlbmFtZSkgIT0g MCkKIAkgICAgewogCSAgICAgIC8qIFdlIHdlcmUgbm90IGluIHRoZSBtYWlu IGZpbGUuICBDbG9zZSB0aGUgYmxvY2sgZm9yIHRoZQogCQkgaW5jbHVkZWQg ZmlsZS4gICovCiAJICAgICAgaWYgKCEgaWVlZV93cml0ZV9ieXRlIChpbmZv LCAoaW50KSBpZWVlX2JlX3JlY29yZF9lbnVtKSkKIAkJcmV0dXJuIEZBTFNF OwotCSAgICAgIGlmIChzdHJjbXAgKGluZm8tPmZpbGVuYW1lLCBpbmZvLT5w ZW5kaW5nX2xpbmVub19maWxlbmFtZSkgPT0gMCkKKwkgICAgICBpZiAoZmls ZW5hbWVfY21wIChpbmZvLT5maWxlbmFtZSwKKwkJCQlpbmZvLT5wZW5kaW5n X2xpbmVub19maWxlbmFtZSkgPT0gMCkKIAkJewogCQkgIC8qIFdlIG5lZWQg YSBuZXcgTk4gcmVjb3JkLCBhbmQgd2UgYXJlbid0IGFib3V0IHRvCiAJCSAg ICAgb3V0cHV0IG9uZS4gICovCkBAIC03MzU5LDcgKzczNjEsOCBAQCBpZWVl X2xpbmVubyAodm9pZCAqcCwgY29uc3QgY2hhciAqZmlsZW5hCiAJCSAgICBy ZXR1cm4gRkFMU0U7CiAJCX0KIAkgICAgfQotCSAgaWYgKHN0cmNtcCAoaW5m by0+ZmlsZW5hbWUsIGluZm8tPnBlbmRpbmdfbGluZW5vX2ZpbGVuYW1lKSAh PSAwKQorCSAgaWYgKGZpbGVuYW1lX2NtcCAoaW5mby0+ZmlsZW5hbWUsCisJ CQkgICAgaW5mby0+cGVuZGluZ19saW5lbm9fZmlsZW5hbWUpICE9IDApCiAJ ICAgIHsKIAkgICAgICAvKiBXZSBhcmUgbm90IGNoYW5naW5nIHRvIHRoZSBt YWluIGZpbGUuICBPcGVuIGEgYmxvY2sgZm9yCiAJCSB0aGUgbmV3IGluY2x1 ZGVkIGZpbGUuICAqLwpJbmRleDogc3JjL2JpbnV0aWxzL25sbWNvbnYuYwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMub3JpZy9iaW51dGlscy9u bG1jb252LmMJMjAxMS0wMi0yNiAyMzowNjo1NC45NjA5MDkxMDAgKzAxMDAK KysrIHNyYy9iaW51dGlscy9ubG1jb252LmMJMjAxMS0wMi0yNyAxMzoyNToy MC40OTk2NjAzMDAgKzAxMDAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRl ICJzeXNkZXAuaCIKICNpbmNsdWRlICJiZmQuaCIKICNpbmNsdWRlICJsaWJp YmVydHkuaCIKKyNpbmNsdWRlICJmaWxlbmFtZXMuaCIKICNpbmNsdWRlICJz YWZlLWN0eXBlLmgiCiAKICNpbmNsdWRlICJhbnNpZGVjbC5oIgpAQCAtMjY4 LDcgKzI2OSw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkg ICsrb3B0aW5kOwogCSAgaWYgKG9wdGluZCA8IGFyZ2MpCiAJICAgIHNob3df dXNhZ2UgKHN0ZGVyciwgMSk7Ci0JICBpZiAoc3RyY21wIChpbnB1dF9maWxl LCBvdXRwdXRfZmlsZSkgPT0gMCkKKwkgIGlmIChmaWxlbmFtZV9jbXAgKGlu cHV0X2ZpbGUsIG91dHB1dF9maWxlKSA9PSAwKQogCSAgICB7CiAJICAgICAg ZmF0YWwgKF8oImlucHV0IGFuZCBvdXRwdXQgZmlsZXMgbXVzdCBiZSBkaWZm ZXJlbnQiKSk7CiAJICAgIH0KSW5kZXg6IHNyYy9iaW51dGlscy9vYmpjb3B5 LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3JjLm9yaWcvYmludXRp bHMvb2JqY29weS5jCTIwMTEtMDItMjYgMjM6MDY6NTQuOTYxOTA5MTAwICsw MTAwCisrKyBzcmMvYmludXRpbHMvb2JqY29weS5jCTIwMTEtMDItMjcgMTI6 MDg6NDguMDk3OTkwMDAwICswMTAwCkBAIC0zMDM1LDcgKzMwMzUsOCBAQCBz dHJpcF9tYWluIChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCSAgIEl0IGhh cyBhbHJlYWR5IGJlZW4gY2hlY2tlZCBpbiBnZXRfZmlsZV9zaXplKCkuICAq LwogCXN0YXQgKGFyZ3ZbaV0sICZzdGF0YnVmKTsKIAotICAgICAgaWYgKG91 dHB1dF9maWxlID09IE5VTEwgfHwgc3RyY21wIChhcmd2W2ldLCBvdXRwdXRf ZmlsZSkgPT0gMCkKKyAgICAgIGlmIChvdXRwdXRfZmlsZSA9PSBOVUxMCisJ ICB8fCBmaWxlbmFtZV9jbXAgKGFyZ3ZbaV0sIG91dHB1dF9maWxlKSA9PSAw KQogCXRtcG5hbWUgPSBtYWtlX3RlbXBuYW1lIChhcmd2W2ldKTsKICAgICAg IGVsc2UKIAl0bXBuYW1lID0gb3V0cHV0X2ZpbGU7CkBAIC0zOTAyLDcgKzM5 MDMsOCBAQCBjb3B5X21haW4gKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAK ICAgLyogSWYgdGhlcmUgaXMgbm8gZGVzdGluYXRpb24gZmlsZSwgb3IgdGhl IHNvdXJjZSBhbmQgZGVzdGluYXRpb24gZmlsZXMKICAgICAgYXJlIHRoZSBz YW1lLCB0aGVuIGNyZWF0ZSBhIHRlbXAgYW5kIHJlbmFtZSB0aGUgcmVzdWx0 IGludG8gdGhlIGlucHV0LiAgKi8KLSAgaWYgKG91dHB1dF9maWxlbmFtZSA9 PSBOVUxMIHx8IHN0cmNtcCAoaW5wdXRfZmlsZW5hbWUsIG91dHB1dF9maWxl bmFtZSkgPT0gMCkKKyAgaWYgKG91dHB1dF9maWxlbmFtZSA9PSBOVUxMCisg ICAgICB8fCBmaWxlbmFtZV9jbXAgKGlucHV0X2ZpbGVuYW1lLCBvdXRwdXRf ZmlsZW5hbWUpID09IDApCiAgICAgdG1wbmFtZSA9IG1ha2VfdGVtcG5hbWUg KGlucHV0X2ZpbGVuYW1lKTsKICAgZWxzZQogICAgIHRtcG5hbWUgPSBvdXRw dXRfZmlsZW5hbWU7CkluZGV4OiBzcmMvYmludXRpbHMvb2JqZHVtcC5jCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIHNyYy5vcmlnL2JpbnV0aWxzL29i amR1bXAuYwkyMDExLTAyLTI2IDIzOjA2OjU0Ljk2MjkwOTEwMCArMDEwMAor Kysgc3JjL2JpbnV0aWxzL29iamR1bXAuYwkyMDExLTAyLTI3IDEyOjA4OjQ4 LjExOTk5MTIwMCArMDEwMApAQCAtMTM0OCw3ICsxMzQ4LDcgQEAgc2hvd19s aW5lIChiZmQgKmFiZmQsIGFzZWN0aW9uICpzZWN0aW9uLAogICAgICAgdW5z aWduZWQgbDsKIAogICAgICAgZm9yIChwcCA9ICZwcmludF9maWxlczsgKnBw ICE9IE5VTEw7IHBwID0gJigqcHApLT5uZXh0KQotCWlmIChzdHJjbXAgKCgq cHApLT5maWxlbmFtZSwgZmlsZW5hbWUpID09IDApCisJaWYgKGZpbGVuYW1l X2NtcCAoKCpwcCktPmZpbGVuYW1lLCBmaWxlbmFtZSkgPT0gMCkKIAkgIGJy ZWFrOwogICAgICAgcCA9ICpwcDsKIApAQCAtMjg1Niw3ICsyODU2LDcgQEAg ZHVtcF9yZWxvY19zZXQgKGJmZCAqYWJmZCwgYXNlY3Rpb24gKnNlYwogCSAg ICAgICYmIChsaW5lbnVtYmVyICE9IGxhc3RfbGluZQogCQkgIHx8IChmaWxl bmFtZSAhPSBOVUxMCiAJCSAgICAgICYmIGxhc3RfZmlsZW5hbWUgIT0gTlVM TAotCQkgICAgICAmJiBzdHJjbXAgKGZpbGVuYW1lLCBsYXN0X2ZpbGVuYW1l KSAhPSAwKSkpCisJCSAgICAgICYmIGZpbGVuYW1lX2NtcCAoZmlsZW5hbWUs IGxhc3RfZmlsZW5hbWUpICE9IDApKSkKIAkgICAgewogCSAgICAgIHByaW50 ZiAoIiVzOiV1XG4iLCBmaWxlbmFtZSA9PSBOVUxMID8gIj8/PyIgOiBmaWxl bmFtZSwgbGluZW51bWJlcik7CiAJICAgICAgbGFzdF9saW5lID0gbGluZW51 bWJlcjsKSW5kZXg6IHNyYy9iaW51dGlscy9zcmNvbnYuYwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBzcmMub3JpZy9iaW51dGlscy9zcmNvbnYuYwky MDExLTAyLTI2IDIzOjA2OjU0Ljk2NDkwOTEwMCArMDEwMAorKysgc3JjL2Jp bnV0aWxzL3NyY29udi5jCTIwMTEtMDItMjcgMTM6MjY6MTguMjIyOTYxOTAw ICswMTAwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAic3lzcm9mZi5o IgogI2luY2x1ZGUgImNvZmZncm9rLmgiCiAjaW5jbHVkZSAibGliaWJlcnR5 LmgiCisjaW5jbHVkZSAiZmlsZW5hbWVzLmgiCiAjaW5jbHVkZSAiZ2V0b3B0 LmgiCiAKICNpbmNsdWRlICJjb2ZmL2ludGVybmFsLmgiCkBAIC0xODE4LDcg KzE4MTksNyBAQCBtYWluIChpbnQgYWMsIGNoYXIgKiphdikKIAkgICsrb3B0 aW5kOwogCSAgaWYgKG9wdGluZCA8IGFjKQogCSAgICBzaG93X3VzYWdlIChz dGRlcnIsIDEpOwotCSAgaWYgKHN0cmNtcCAoaW5wdXRfZmlsZSwgb3V0cHV0 X2ZpbGUpID09IDApCisJICBpZiAoZmlsZW5hbWVfY21wIChpbnB1dF9maWxl LCBvdXRwdXRfZmlsZSkgPT0gMCkKIAkgICAgewogCSAgICAgIGZhdGFsIChf KCJpbnB1dCBhbmQgb3V0cHV0IGZpbGVzIG11c3QgYmUgZGlmZmVyZW50Iikp OwogCSAgICB9CkluZGV4OiBzcmMvYmludXRpbHMvd3JzdGFicy5jCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIHNyYy5vcmlnL2JpbnV0aWxzL3dyc3Rh YnMuYwkyMDExLTAyLTI2IDIzOjA2OjU0Ljk3MTkwOTEwMCArMDEwMAorKysg c3JjL2JpbnV0aWxzL3dyc3RhYnMuYwkyMDExLTAyLTI3IDEyOjA4OjQ4LjE0 Njk5MjgwMCArMDEwMApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgPGFz c2VydC5oPgogI2luY2x1ZGUgImJmZC5oIgogI2luY2x1ZGUgImxpYmliZXJ0 eS5oIgorI2luY2x1ZGUgImZpbGVuYW1lcy5oIgogI2luY2x1ZGUgInNhZmUt Y3R5cGUuaCIKICNpbmNsdWRlICJidWNvbW0uaCIKICNpbmNsdWRlICJkZWJ1 Zy5oIgpAQCAtMjI2MSw3ICsyMjYyLDcgQEAgc3RhYl9saW5lbm8gKHZvaWQg KnAsIGNvbnN0IGNoYXIgKmZpbGUsCiAgIGlmIChhZGRyID4gaW5mby0+bGFz dF90ZXh0X2FkZHJlc3MpCiAgICAgaW5mby0+bGFzdF90ZXh0X2FkZHJlc3Mg PSBhZGRyOwogCi0gIGlmIChzdHJjbXAgKGZpbGUsIGluZm8tPmxpbmVub19m aWxlbmFtZSkgIT0gMCkKKyAgaWYgKGZpbGVuYW1lX2NtcCAoZmlsZSwgaW5m by0+bGluZW5vX2ZpbGVuYW1lKSAhPSAwKQogICAgIHsKICAgICAgIGlmICgh IHN0YWJfd3JpdGVfc3ltYm9sIChpbmZvLCBOX1NPTCwgMCwgYWRkciwgZmls ZSkpCiAJcmV0dXJuIEZBTFNFOwpJbmRleDogc3JjL2dhcy9kZXBlbmQuYwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMub3JpZy9nYXMvZGVwZW5k LmMJMjAxMS0wMi0yNiAyMzowNjo1NC45NzU5MDkxMDAgKzAxMDAKKysrIHNy Yy9nYXMvZGVwZW5kLmMJMjAxMS0wMi0yNyAxMjowODo0OC4xNjE5OTM2MDAg KzAxMDAKQEAgLTIwLDYgKzIwLDcgQEAKICAgIDAyMTEwLTEzMDEsIFVTQS4g ICovCiAKICNpbmNsdWRlICJhcy5oIgorI2luY2x1ZGUgImZpbGVuYW1lcy5o IgogCiAvKiBUaGUgZmlsZSB0byB3cml0ZSB0bywgb3IgTlVMTCBpZiBubyBk ZXBlbmRlbmNpZXMgYmVpbmcga2VwdC4gICovCiBzdGF0aWMgY2hhciAqIGRl cF9maWxlID0gTlVMTDsKQEAgLTYzLDcgKzY0LDcgQEAgcmVnaXN0ZXJfZGVw ZW5kZW5jeSAoY2hhciAqZmlsZW5hbWUpCiAKICAgZm9yIChkZXAgPSBkZXBf Y2hhaW47IGRlcCAhPSBOVUxMOyBkZXAgPSBkZXAtPm5leHQpCiAgICAgewot ICAgICAgaWYgKCFzdHJjbXAgKGZpbGVuYW1lLCBkZXAtPmZpbGUpKQorICAg ICAgaWYgKCFmaWxlbmFtZV9jbXAgKGZpbGVuYW1lLCBkZXAtPmZpbGUpKQog CXJldHVybjsKICAgICB9CiAKSW5kZXg6IHNyYy9nYXMvZHdhcmYyZGJnLmMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3JjLm9yaWcvZ2FzL2R3YXJm MmRiZy5jCTIwMTEtMDItMjYgMjM6MDY6NTQuOTc2OTA5MTAwICswMTAwCisr KyBzcmMvZ2FzL2R3YXJmMmRiZy5jCTIwMTEtMDItMjcgMTI6MDg6NDguMTY5 OTk0MTAwICswMTAwCkBAIC00MzEsMTQgKzQzMSwxNCBAQCBnZXRfZmlsZW51 bSAoY29uc3QgY2hhciAqZmlsZW5hbWUsIHVuc2lnCiAgIGlmIChudW0gPT0g MCAmJiBsYXN0X3VzZWQpCiAgICAgewogICAgICAgaWYgKCEgZmlsZXNbbGFz dF91c2VkXS5kaXIKLQkgICYmIHN0cmNtcCAoZmlsZW5hbWUsIGZpbGVzW2xh c3RfdXNlZF0uZmlsZW5hbWUpID09IDApCisJICAmJiBmaWxlbmFtZV9jbXAg KGZpbGVuYW1lLCBmaWxlc1tsYXN0X3VzZWRdLmZpbGVuYW1lKSA9PSAwKQog CXJldHVybiBsYXN0X3VzZWQ7CiAgICAgICBpZiAoZmlsZXNbbGFzdF91c2Vk XS5kaXIKLQkgICYmIHN0cm5jbXAgKGZpbGVuYW1lLCBkaXJzW2ZpbGVzW2xh c3RfdXNlZF0uZGlyXSwKLQkJICAgICAgbGFzdF91c2VkX2Rpcl9sZW4pID09 IDAKKwkgICYmIGZpbGVuYW1lX25jbXAgKGZpbGVuYW1lLCBkaXJzW2ZpbGVz W2xhc3RfdXNlZF0uZGlyXSwKKwkJCSAgICBsYXN0X3VzZWRfZGlyX2xlbikg PT0gMAogCSAgJiYgSVNfRElSX1NFUEFSQVRPUiAoZmlsZW5hbWUgW2xhc3Rf dXNlZF9kaXJfbGVuXSkKLQkgICYmIHN0cmNtcCAoZmlsZW5hbWUgKyBsYXN0 X3VzZWRfZGlyX2xlbiArIDEsCi0JCSAgICAgZmlsZXNbbGFzdF91c2VkXS5m aWxlbmFtZSkgPT0gMCkKKwkgICYmIGZpbGVuYW1lX2NtcCAoZmlsZW5hbWUg KyBsYXN0X3VzZWRfZGlyX2xlbiArIDEsCisJCQkgICBmaWxlc1tsYXN0X3Vz ZWRdLmZpbGVuYW1lKSA9PSAwKQogCXJldHVybiBsYXN0X3VzZWQ7CiAgICAg fQogCkBAIC00NjAsNyArNDYwLDcgQEAgZ2V0X2ZpbGVudW0gKGNvbnN0IGNo YXIgKmZpbGVuYW1lLCB1bnNpZwogICAgICAgLS1kaXJfbGVuOwogI2VuZGlm CiAgICAgICBmb3IgKGRpciA9IDE7IGRpciA8IGRpcnNfaW5fdXNlOyArK2Rp cikKLQlpZiAoc3RybmNtcCAoZmlsZW5hbWUsIGRpcnNbZGlyXSwgZGlyX2xl bikgPT0gMAorCWlmIChmaWxlbmFtZV9uY21wIChmaWxlbmFtZSwgZGlyc1tk aXJdLCBkaXJfbGVuKSA9PSAwCiAJICAgICYmIGRpcnNbZGlyXVtkaXJfbGVu XSA9PSAnXDAnKQogCSAgYnJlYWs7CiAKQEAgLTQ4NSw3ICs0ODUsNyBAQCBn ZXRfZmlsZW51bSAoY29uc3QgY2hhciAqZmlsZW5hbWUsIHVuc2lnCiAgICAg ICBmb3IgKGkgPSAxOyBpIDwgZmlsZXNfaW5fdXNlOyArK2kpCiAJaWYgKGZp bGVzW2ldLmRpciA9PSBkaXIKIAkgICAgJiYgZmlsZXNbaV0uZmlsZW5hbWUK LQkgICAgJiYgc3RyY21wIChmaWxlLCBmaWxlc1tpXS5maWxlbmFtZSkgPT0g MCkKKwkgICAgJiYgZmlsZW5hbWVfY21wIChmaWxlLCBmaWxlc1tpXS5maWxl bmFtZSkgPT0gMCkKIAkgIHsKIAkgICAgbGFzdF91c2VkID0gaTsKIAkgICAg bGFzdF91c2VkX2Rpcl9sZW4gPSBkaXJfbGVuOwpJbmRleDogc3JjL2dhcy9l Y29mZi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHNyYy5vcmlnL2dh cy9lY29mZi5jCTIwMTEtMDItMjYgMjM6MDY6NTQuOTc3OTA5MTAwICswMTAw CisrKyBzcmMvZ2FzL2Vjb2ZmLmMJMjAxMS0wMi0yNyAxMjowODo0OC4xODI5 OTQ4MDAgKzAxMDAKQEAgLTIyNTcsNyArMjI1Nyw3IEBAIGFkZF9maWxlIChj b25zdCBjaGFyICpmaWxlX25hbWUsIGludCBpbmQKICAgICAgICBmaWxfcHRy ID0gZmlsX3B0ci0+bmV4dF9maWxlKQogICAgIHsKICAgICAgIGlmIChmaXJz dF9jaCA9PSBmaWxfcHRyLT5uYW1lWzBdCi0JICAmJiBzdHJjbXAgKGZpbGVf bmFtZSwgZmlsX3B0ci0+bmFtZSkgPT0gMAorCSAgJiYgZmlsZW5hbWVfY21w IChmaWxlX25hbWUsIGZpbF9wdHItPm5hbWUpID09IDAKIAkgICYmIGZpbF9w dHItPmZkci5mTWVyZ2UpCiAJewogCSAgY3VyX2ZpbGVfcHRyID0gZmlsX3B0 cjsKQEAgLTIzMjUsNyArMjMyNSw3IEBAIGFkZF9maWxlIChjb25zdCBjaGFy ICpmaWxlX25hbWUsIGludCBpbmQKIHZvaWQKIGVjb2ZmX25ld19maWxlIChj b25zdCBjaGFyICpuYW1lLCBpbnQgYXBwZmlsZSBBVFRSSUJVVEVfVU5VU0VE KQogewotICBpZiAoY3VyX2ZpbGVfcHRyICE9IE5VTEwgJiYgc3RyY21wIChj dXJfZmlsZV9wdHItPm5hbWUsIG5hbWUpID09IDApCisgIGlmIChjdXJfZmls ZV9wdHIgIT0gTlVMTCAmJiBmaWxlbmFtZV9jbXAgKGN1cl9maWxlX3B0ci0+ bmFtZSwgbmFtZSkgPT0gMCkKICAgICByZXR1cm47CiAgIGFkZF9maWxlIChu YW1lLCAwLCAwKTsKIApAQCAtNTIwMCw3ICs1MjAwLDcgQEAgZWNvZmZfZ2Vu ZXJhdGVfYXNtX2xpbmVubyAodm9pZCkKICAgYXNfd2hlcmUgKCZmaWxlbmFt ZSwgJmxpbmVubyk7CiAKICAgaWYgKGN1cnJlbnRfc3RhYnNfZmlsZW5hbWUg PT0gKGNoYXIgKikgTlVMTAotICAgICAgfHwgc3RyY21wIChjdXJyZW50X3N0 YWJzX2ZpbGVuYW1lLCBmaWxlbmFtZSkpCisgICAgICB8fCBmaWxlbmFtZV9j bXAgKGN1cnJlbnRfc3RhYnNfZmlsZW5hbWUsIGZpbGVuYW1lKSkKICAgICBh ZGRfZmlsZSAoZmlsZW5hbWUsIDAsIDEpOwogCiAgIGxpc3QgPSBhbGxvY2F0 ZV9saW5lbm9fbGlzdCAoKTsKSW5kZXg6IHNyYy9nYXMvaW5wdXQtc2NydWIu Ywo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMub3JpZy9nYXMvaW5w dXQtc2NydWIuYwkyMDExLTAyLTI2IDIzOjA2OjU0Ljk3ODkwOTEwMCArMDEw MAorKysgc3JjL2dhcy9pbnB1dC1zY3J1Yi5jCTIwMTEtMDItMjcgMTI6MDg6 NDguMjA2OTk2MjAwICswMTAwCkBAIC0yMSw2ICsyMSw3IEBACiAgICAwMjEx MC0xMzAxLCBVU0EuICAqLwogCiAjaW5jbHVkZSAiYXMuaCIKKyNpbmNsdWRl ICJmaWxlbmFtZXMuaCIKICNpbmNsdWRlICJpbnB1dC1maWxlLmgiCiAjaW5j bHVkZSAic2IuaCIKICNpbmNsdWRlICJsaXN0aW5nLmgiCkBAIC00NzQsNyAr NDc1LDcgQEAgbmV3X2xvZ2ljYWxfbGluZV9mbGFncyAoY2hhciAqZm5hbWUs IC8qCiAKICAgaWYgKGZuYW1lCiAgICAgICAmJiAobG9naWNhbF9pbnB1dF9m aWxlID09IE5VTEwKLQkgIHx8IHN0cmNtcCAobG9naWNhbF9pbnB1dF9maWxl LCBmbmFtZSkpKQorCSAgfHwgZmlsZW5hbWVfY21wIChsb2dpY2FsX2lucHV0 X2ZpbGUsIGZuYW1lKSkpCiAgICAgewogICAgICAgbG9naWNhbF9pbnB1dF9m aWxlID0gZm5hbWU7CiAgICAgICByZXR1cm4gMTsKSW5kZXg6IHNyYy9nYXMv bGlzdGluZy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHNyYy5vcmln L2dhcy9saXN0aW5nLmMJMjAxMS0wMi0yNiAyMzowNjo1NC45Nzk5MDkxMDAg KzAxMDAKKysrIHNyYy9nYXMvbGlzdGluZy5jCTIwMTEtMDItMjcgMTI6MDg6 NDguMjEzOTk2NjAwICswMTAwCkBAIC05MCw2ICs5MCw3IEBACiAgICAgICAg ICAgICAgICAgICAgICAgICBvbiBhIGxpbmUuICAqLwogCiAjaW5jbHVkZSAi YXMuaCIKKyNpbmNsdWRlICJmaWxlbmFtZXMuaCIKICNpbmNsdWRlICJvYnN0 YWNrLmgiCiAjaW5jbHVkZSAic2FmZS1jdHlwZS5oIgogI2luY2x1ZGUgImlu cHV0LWZpbGUuaCIKQEAgLTI1Nyw3ICsyNTgsNyBAQCBmaWxlX2luZm8gKGNv bnN0IGNoYXIgKmZpbGVfbmFtZSkKIAogICB3aGlsZSAocCAhPSAoZmlsZV9p bmZvX3R5cGUgKikgTlVMTCkKICAgICB7Ci0gICAgICBpZiAoc3RyY21wIChw LT5maWxlbmFtZSwgZmlsZV9uYW1lKSA9PSAwKQorICAgICAgaWYgKGZpbGVu YW1lX2NtcCAocC0+ZmlsZW5hbWUsIGZpbGVfbmFtZSkgPT0gMCkKIAlyZXR1 cm4gcDsKICAgICAgIHAgPSBwLT5uZXh0OwogICAgIH0KQEAgLTMxOCw3ICsz MTksNyBAQCBsaXN0aW5nX25ld2xpbmUgKGNoYXIgKnBzKQogICBpZiAocHMg PT0gTlVMTCkKICAgICB7CiAgICAgICBpZiAobGluZSA9PSBsYXN0X2xpbmUK LQkgICYmICEobGFzdF9maWxlICYmIGZpbGUgJiYgc3RyY21wIChmaWxlLCBs YXN0X2ZpbGUpKSkKKwkgICYmICEobGFzdF9maWxlICYmIGZpbGUgJiYgZmls ZW5hbWVfY21wIChmaWxlLCBsYXN0X2ZpbGUpKSkKIAlyZXR1cm47CiAKICAg ICAgIG5ld19pID0gKGxpc3RfaW5mb190eXBlICopIHhtYWxsb2MgKHNpemVv ZiAobGlzdF9pbmZvX3R5cGUpKTsKSW5kZXg6IHNyYy9nYXMvcmVtYXAuYwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMub3JpZy9nYXMvcmVtYXAu YwkyMDExLTAyLTI2IDIzOjA2OjU0Ljk4MTkwOTEwMCArMDEwMAorKysgc3Jj L2dhcy9yZW1hcC5jCTIwMTEtMDItMjcgMTI6MDg6NDguMjIxOTk3MTAwICsw MTAwCkBAIC0xOSw2ICsxOSw3IEBACiAgICAwMjExMC0xMzAxLCBVU0EuICAq LwogCiAjaW5jbHVkZSAiYXMuaCIKKyNpbmNsdWRlICJmaWxlbmFtZXMuaCIK IAogLyogU3RydWN0dXJlIHJlY29yZGluZyB0aGUgbWFwcGluZyBmcm9tIHNv dXJjZSBmaWxlIGFuZCBkaXJlY3RvcnkKICAgIG5hbWVzIGF0IGNvbXBpbGUg dGltZSB0byB0aG9zZSB0byBiZSBlbWJlZGRlZCBpbiBkZWJ1ZwpAQCAtNzYs NyArNzcsNyBAQCByZW1hcF9kZWJ1Z19maWxlbmFtZSAoY29uc3QgY2hhciAq ZmlsZW5hCiAgIHNpemVfdCBuYW1lX2xlbjsKIAogICBmb3IgKG1hcCA9IGRl YnVnX3ByZWZpeF9tYXBzOyBtYXA7IG1hcCA9IG1hcC0+bmV4dCkKLSAgICBp ZiAoc3RybmNtcCAoZmlsZW5hbWUsIG1hcC0+b2xkX3ByZWZpeCwgbWFwLT5v bGRfbGVuKSA9PSAwKQorICAgIGlmIChmaWxlbmFtZV9uY21wIChmaWxlbmFt ZSwgbWFwLT5vbGRfcHJlZml4LCBtYXAtPm9sZF9sZW4pID09IDApCiAgICAg ICBicmVhazsKICAgaWYgKCFtYXApCiAgICAgcmV0dXJuIGZpbGVuYW1lOwpJ bmRleDogc3JjL2dhcy9zdGFicy5jCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHNyYy5vcmlnL2dhcy9zdGFicy5jCTIwMTEtMDItMjYgMjM6MDY6NTQu OTkyOTA5MTAwICswMTAwCisrKyBzcmMvZ2FzL3N0YWJzLmMJMjAxMS0wMi0y NyAxMjowODo0OC4yMjU5OTczMDAgKzAxMDAKQEAgLTIwLDYgKzIwLDcgQEAK ICAgIDAyMTEwLTEzMDEsIFVTQS4gICovCiAKICNpbmNsdWRlICJhcy5oIgor I2luY2x1ZGUgImZpbGVuYW1lcy5oIgogI2luY2x1ZGUgIm9ic3RhY2suaCIK ICNpbmNsdWRlICJzdWJzZWdzLmgiCiAjaW5jbHVkZSAiZWNvZmYuaCIKQEAg LTUyMSw3ICs1MjIsNyBAQCBnZW5lcmF0ZV9hc21fZmlsZSAoaW50IHR5cGUs IGNoYXIgKmZpbGUpCiAgIGNoYXIgKmJ1ZnA7CiAKICAgaWYgKGxhc3RfZmls ZSAhPSBOVUxMCi0gICAgICAmJiBzdHJjbXAgKGxhc3RfZmlsZSwgZmlsZSkg PT0gMCkKKyAgICAgICYmIGZpbGVuYW1lX2NtcCAobGFzdF9maWxlLCBmaWxl KSA9PSAwKQogICAgIHJldHVybjsKIAogICAvKiBSYXRoZXIgdGhhbiB0cnkg dG8gZG8gdGhpcyBpbiBzb21lIGVmZmljaWVudCBmYXNoaW9uLCB3ZSBqdXN0 CkBAIC02MDUsNyArNjA2LDcgQEAgc3RhYnNfZ2VuZXJhdGVfYXNtX2xpbmVu byAodm9pZCkKICAgICAgIHByZXZfbGluZW5vID0gbGluZW5vOwogICAgIH0K ICAgZWxzZSBpZiAobGluZW5vID09IHByZXZfbGluZW5vCi0JICAgJiYgc3Ry Y21wIChmaWxlLCBwcmV2X2ZpbGUpID09IDApCisJICAgJiYgZmlsZW5hbWVf Y21wIChmaWxlLCBwcmV2X2ZpbGUpID09IDApCiAgICAgewogICAgICAgLyog U2FtZSBmaWxlL2xpbmUgYXMgbGFzdCB0aW1lLiAgKi8KICAgICAgIHJldHVy bjsKQEAgLTYxNCw3ICs2MTUsNyBAQCBzdGFic19nZW5lcmF0ZV9hc21fbGlu ZW5vICh2b2lkKQogICAgIHsKICAgICAgIC8qIFJlbWVtYmVyIGZpbGUvbGlu ZSBmb3IgbmV4dCB0aW1lLiAgKi8KICAgICAgIHByZXZfbGluZW5vID0gbGlu ZW5vOwotICAgICAgaWYgKHN0cmNtcCAoZmlsZSwgcHJldl9maWxlKSAhPSAw KQorICAgICAgaWYgKGZpbGVuYW1lX2NtcCAoZmlsZSwgcHJldl9maWxlKSAh PSAwKQogCXsKIAkgIGZyZWUgKHByZXZfZmlsZSk7CiAJICBwcmV2X2ZpbGUg PSB4c3RyZHVwIChmaWxlKTsK --001485f78ec2c5edf5049d530ac1--