Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:13749 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 69728 invoked by uid 1010); 6 Nov 2004 03:56:24 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 63900 invoked from network); 6 Nov 2004 03:55:24 -0000 Received: from unknown (HELO mail.kwikin.com) (207.142.136.129) by pb1.pair.com with SMTP; 6 Nov 2004 03:55:24 -0000 Received: (qmail 15616 invoked from network); 6 Nov 2004 03:55:22 -0000 Received: from unknown (HELO madal.kwikin.com) (203.20.132.4) by 207.142.136.129 with SMTP; Sat, 06 Nov 2004 03:55:22 +0000 Date: Sat, 6 Nov 2004 13:55:21 +1000 Reply-To: Tom Rogers Organization: Perfect Web Site Designs X-Priority: 3 (Normal) Message-ID: <1339084182.20041106135521@kwikin.com> To: internals@lists.php.net In-Reply-To: <132979735.20041106012557@marcus-boerger.de> References: <418B4909.7010203@ailis.de> <255444644.20041105104900@marcus-boerger.de> <418B4FF6.4020503@ailis.de> <1306684207.20041105111518@marcus-boerger.de> <418B5929.30709@ailis.de> <34391708.20041106101633@kwikin.com> <132979735.20041106012557@marcus-boerger.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----------1229B1CD126B94FD" Subject: Re[2]: [PHP-DEV] Upload Progress Meter Patch From: trogers@kwikin.com (Tom Rogers) ------------1229B1CD126B94FD Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, Saturday, November 6, 2004, 10:25:57 AM, you wrote: MB> Hello Tom, MB> can you please provide a unified diff (diff -u) which everyone here MB> understands? Also it would help to see a diff against HEAD. MB> regards MB> marcus This is against the latest cvs 4.3 -- regards, Tom ------------1229B1CD126B94FD Content-Type: text/plain; name="fileupload_dif.txt" Content-transfer-encoding: base64 Content-Disposition: attachment; filename="fileupload_dif.txt" SW5kZXg6IFplbmQvemVuZC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9yZXBvc2l0b3J5 L1plbmQvQXR0aWMvemVuZC5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE2Mi4yLjIxCmRp ZmYgLXUgLXcgLWIgLXUgLXIxLjE2Mi4yLjIxIHplbmQuYwotLS0gWmVuZC96ZW5kLmMJOSBT ZXAgMjAwNCAxMzoyNzo0OCAtMDAwMAkxLjE2Mi4yLjIxCisrKyBaZW5kL3plbmQuYwk2IE5v diAyMDA0IDAyOjI3OjM4IC0wMDAwCkBAIC04MCw2ICs4MCw3IEBACiBaRU5EX0FQSSBpbnQg Y29tcGlsZXJfZ2xvYmFsc19pZDsKIFpFTkRfQVBJIGludCBleGVjdXRvcl9nbG9iYWxzX2lk OwogWkVORF9BUEkgaW50IGFsbG9jX2dsb2JhbHNfaWQ7CitaRU5EX0FQSSBpbnQgZnVzX2ds b2JhbHNfaWQ7CiBIYXNoVGFibGUgKmdsb2JhbF9mdW5jdGlvbl90YWJsZTsKIEhhc2hUYWJs ZSAqZ2xvYmFsX2NsYXNzX3RhYmxlOwogSGFzaFRhYmxlICpnbG9iYWxfY29uc3RhbnRzX3Rh YmxlOwpAQCAtMzY4LDYgKzM2OSwxNSBAQAogCXplbmRfaW5pX3NodXRkb3duKFRTUk1MU19D KTsKIH0KIAorc3RhdGljIHZvaWQgZnVzX2dsb2JhbHNfY3Rvcih6ZW5kX2Z1c19nbG9iYWxz ICpmdXNfZ2xvYmFscyBUU1JNTFNfREMpCit7CisKK30KKworc3RhdGljIHZvaWQgZnVzX2ds b2JhbHNfZHRvcih6ZW5kX2V4ZWN1dG9yX2dsb2JhbHMgKmZ1c19nbG9iYWxzIFRTUk1MU19E QykKK3sKKwkKK30KIAogc3RhdGljIHZvaWQgemVuZF9uZXdfdGhyZWFkX2VuZF9oYW5kbGVy KFRIUkVBRF9UIHRocmVhZF9pZCBUU1JNTFNfREMpCiB7CkBAIC00MTYsNiArNDI2LDcgQEAK ICNpZmRlZiBaVFMKIAl6ZW5kX2NvbXBpbGVyX2dsb2JhbHMgKmNvbXBpbGVyX2dsb2JhbHM7 CiAJemVuZF9leGVjdXRvcl9nbG9iYWxzICpleGVjdXRvcl9nbG9iYWxzOworCXplbmRfZnVz X2dsb2JhbHMgKmZ1c19nbG9iYWxzOwogCXZvaWQgKioqdHNybV9sczsKIAlleHRlcm4gWkVO RF9BUEkgdHNfcnNyY19pZCBpbmlfc2Nhbm5lcl9nbG9iYWxzX2lkOwogCWV4dGVybiBaRU5E X0FQSSB0c19yc3JjX2lkIGxhbmd1YWdlX3NjYW5uZXJfZ2xvYmFsc19pZDsKQEAgLTQ4Mywx MCArNDk0LDEyIEBACiAJZ2xvYmFsX2NvbnN0YW50c190YWJsZSA9IE5VTEw7CiAJdHNfYWxs b2NhdGVfaWQoJmNvbXBpbGVyX2dsb2JhbHNfaWQsIHNpemVvZih6ZW5kX2NvbXBpbGVyX2ds b2JhbHMpLCAodHNfYWxsb2NhdGVfY3RvcikgY29tcGlsZXJfZ2xvYmFsc19jdG9yLCAodHNf YWxsb2NhdGVfZHRvcikgY29tcGlsZXJfZ2xvYmFsc19kdG9yKTsKIAl0c19hbGxvY2F0ZV9p ZCgmZXhlY3V0b3JfZ2xvYmFsc19pZCwgc2l6ZW9mKHplbmRfZXhlY3V0b3JfZ2xvYmFscyks ICh0c19hbGxvY2F0ZV9jdG9yKSBleGVjdXRvcl9nbG9iYWxzX2N0b3IsICh0c19hbGxvY2F0 ZV9kdG9yKSBleGVjdXRvcl9nbG9iYWxzX2R0b3IpOworCXRzX2FsbG9jYXRlX2lkKCZmdXNf Z2xvYmFsc19pZCwgc2l6ZW9mKHplbmRfZnVzX2dsb2JhbHMpLCAodHNfYWxsb2NhdGVfY3Rv cikgZnVzX2dsb2JhbHNfY3RvciwgKHRzX2FsbG9jYXRlX2R0b3IpIGZ1c19nbG9iYWxzX2R0 b3IpOwogCXRzX2FsbG9jYXRlX2lkKCZsYW5ndWFnZV9zY2FubmVyX2dsb2JhbHNfaWQsIHNp emVvZih6ZW5kX3NjYW5uZXJfZ2xvYmFscyksICh0c19hbGxvY2F0ZV9jdG9yKSBzY2FubmVy X2dsb2JhbHNfY3RvciwgTlVMTCk7CiAJdHNfYWxsb2NhdGVfaWQoJmluaV9zY2FubmVyX2ds b2JhbHNfaWQsIHNpemVvZih6ZW5kX3NjYW5uZXJfZ2xvYmFscyksICh0c19hbGxvY2F0ZV9j dG9yKSBzY2FubmVyX2dsb2JhbHNfY3RvciwgTlVMTCk7CiAJY29tcGlsZXJfZ2xvYmFscyA9 IHRzX3Jlc291cmNlKGNvbXBpbGVyX2dsb2JhbHNfaWQpOwogCWV4ZWN1dG9yX2dsb2JhbHMg PSB0c19yZXNvdXJjZShleGVjdXRvcl9nbG9iYWxzX2lkKTsKKwlmdXNfZ2xvYmFscyA9IHRz X3Jlc291cmNlKGZ1c19nbG9iYWxzX2lkKTsKIAl0c3JtX2xzID0gdHNfcmVzb3VyY2VfZXgo MCwgTlVMTCk7CiAJY29tcGlsZXJfZ2xvYmFsc19kdG9yKGNvbXBpbGVyX2dsb2JhbHMsIHRz cm1fbHMpOwogCWNvbXBpbGVyX2dsb2JhbHMtPmZ1bmN0aW9uX3RhYmxlID0gR0xPQkFMX0ZV TkNUSU9OX1RBQkxFOwpJbmRleDogWmVuZC96ZW5kX2dsb2JhbHMuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 ClJDUyBmaWxlOiAvcmVwb3NpdG9yeS9aZW5kL0F0dGljL3plbmRfZ2xvYmFscy5oLHYKcmV0 cmlldmluZyByZXZpc2lvbiAxLjkzLjIuNQpkaWZmIC11IC13IC1iIC11IC1yMS45My4yLjUg emVuZF9nbG9iYWxzLmgKLS0tIFplbmQvemVuZF9nbG9iYWxzLmgJMyBOb3YgMjAwNCAyMzox NTowNSAtMDAwMAkxLjkzLjIuNQorKysgWmVuZC96ZW5kX2dsb2JhbHMuaAk2IE5vdiAyMDA0 IDAyOjM1OjI4IC0wMDAwCkBAIC00Niw2ICs0Niw3IEBACiBaRU5EX0FQSSBleHRlcm4gaW50 IGNvbXBpbGVyX2dsb2JhbHNfaWQ7CiBaRU5EX0FQSSBleHRlcm4gaW50IGV4ZWN1dG9yX2ds b2JhbHNfaWQ7CiBaRU5EX0FQSSBleHRlcm4gaW50IGFsbG9jX2dsb2JhbHNfaWQ7CitaRU5E X0FQSSBleHRlcm4gaW50IGZ1c19nbG9iYWxzX2lkOwogRU5EX0VYVEVSTl9DKCkKIAogI2Vu ZGlmCkBAIC0yNzAsNCArMjcxLDEwIEBACiAjZW5kaWYgLyogWkVORF9NVUxUSUJZVEUgKi8K IH07CiAKK3N0cnVjdCBfemVuZF9mdXNfZ2xvYmFscyB7CisJY2hhciAqdGVtcF9maWxlX2Rp cjsKKwljaGFyICp0ZW1wX2ZpbGVfcHJlZml4OworCWNoYXIgKmhpZGRlbl92YXJpYWJsZV9u YW1lOworfTsKKwogI2VuZGlmIC8qIFpFTkRfR0xPQkFMU19IICovCkluZGV4OiBaZW5kL3pl bmRfZ2xvYmFsc19tYWNyb3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvcmVwb3NpdG9y eS9aZW5kL0F0dGljL3plbmRfZ2xvYmFsc19tYWNyb3MuaCx2CnJldHJpZXZpbmcgcmV2aXNp b24gMS4xNy44LjEKZGlmZiAtdSAtdyAtYiAtdSAtcjEuMTcuOC4xIHplbmRfZ2xvYmFsc19t YWNyb3MuaAotLS0gWmVuZC96ZW5kX2dsb2JhbHNfbWFjcm9zLmgJMzEgRGVjIDIwMDIgMTY6 MjM6MDIgLTAwMDAJMS4xNy44LjEKKysrIFplbmQvemVuZF9nbG9iYWxzX21hY3Jvcy5oCTYg Tm92IDIwMDQgMDI6NDk6MjIgLTAwMDAKQEAgLTI1LDYgKzI1LDggQEAKIHR5cGVkZWYgc3Ry dWN0IF96ZW5kX2V4ZWN1dG9yX2dsb2JhbHMgemVuZF9leGVjdXRvcl9nbG9iYWxzOwogdHlw ZWRlZiBzdHJ1Y3QgX3plbmRfYWxsb2NfZ2xvYmFscyB6ZW5kX2FsbG9jX2dsb2JhbHM7CiB0 eXBlZGVmIHN0cnVjdCBfemVuZF9zY2FubmVyX2dsb2JhbHMgemVuZF9zY2FubmVyX2dsb2Jh bHM7Cit0eXBlZGVmIHN0cnVjdCBfemVuZF9mdXNfZ2xvYmFscyB6ZW5kX2Z1c19nbG9iYWxz OworCiAKIC8qIENvbXBpbGVyICovCiAjaWZkZWYgWlRTCkBAIC01Niw2ICs1OCwxNCBAQAog ZXh0ZXJuIFpFTkRfQVBJIHplbmRfYWxsb2NfZ2xvYmFscyBhbGxvY19nbG9iYWxzOwogI2Vu ZGlmCiAKKy8qIEZpbGUgVXBsb2FkICovCisjaWZkZWYgWlRTCisjIGRlZmluZSBGVVNHKHYp IFRTUk1HKGZ1c19nbG9iYWxzX2lkLCB6ZW5kX2Z1c19nbG9iYWxzICosIHYpCisjZWxzZQor IyBkZWZpbmUgRlVTRyh2KSAoZnVzX2dsb2JhbHMudikKK2V4dGVybiBaRU5EX0FQSSB6ZW5k X2Z1c19nbG9iYWxzIGZ1c19nbG9iYWxzOworI2VuZGlmCisKIAogLyogTGFuZ3VhZ2UgU2Nh bm5lciAqLwogI2lmZGVmIFpUUwpJbmRleDogbWFpbi9tYWluLmMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS Q1MgZmlsZTogL3JlcG9zaXRvcnkvcGhwLXNyYy9tYWluL21haW4uYyx2CnJldHJpZXZpbmcg cmV2aXNpb24gMS41MTIuMi41NgpkaWZmIC11IC13IC1iIC11IC1yMS41MTIuMi41NiBtYWlu LmMKLS0tIG1haW4vbWFpbi5jCTEgT2N0IDIwMDQgMTQ6Mjc6MTMgLTAwMDAJMS41MTIuMi41 NgorKysgbWFpbi9tYWluLmMJNiBOb3YgMjAwNCAwMjozNToyOCAtMDAwMApAQCAtMzYyLDYg KzM2MiwxMCBAQAogCiAJU1REX1BIUF9JTklfQk9PTEVBTigiYWxsb3dfdXJsX2ZvcGVuIiwJ CSIxIiwJCVBIUF9JTklfU1lTVEVNLAkJT25VcGRhdGVCb29sLAkJCWFsbG93X3VybF9mb3Bl biwJCQlwaHBfY29yZV9nbG9iYWxzLAljb3JlX2dsb2JhbHMpCiAJU1REX1BIUF9JTklfQk9P TEVBTigiYWx3YXlzX3BvcHVsYXRlX3Jhd19wb3N0X2RhdGEiLAkJIjAiLAkJUEhQX0lOSV9T WVNURU18UEhQX0lOSV9QRVJESVIsCQlPblVwZGF0ZUJvb2wsCQkJYWx3YXlzX3BvcHVsYXRl X3Jhd19wb3N0X2RhdGEsCQkJcGhwX2NvcmVfZ2xvYmFscywJY29yZV9nbG9iYWxzKQorLyog ZmlsZSB1cGxvYWQgc3RhdHVzIHNldHRpbmdzICovCisgICAgU1REX1BIUF9JTklfRU5UUlko ImZpbGVfdXBsb2FkX3N0YXR1cy50ZW1wX2ZpbGVfZGlyIiwgIi90bXAiLCBQSFBfSU5JX0FM TCwgT25VcGRhdGVTdHJpbmcsIHRlbXBfZmlsZV9kaXIsIHplbmRfZnVzX2dsb2JhbHMsIGZ1 c19nbG9iYWxzKQorICAgIFNURF9QSFBfSU5JX0VOVFJZKCJmaWxlX3VwbG9hZF9zdGF0dXMu dGVtcF9maWxlX3ByZWZpeCIsICJmaWxlX3VwbG9hZF9zdGF0dXNfIiwgUEhQX0lOSV9BTEws IE9uVXBkYXRlU3RyaW5nLCB0ZW1wX2ZpbGVfcHJlZml4LCB6ZW5kX2Z1c19nbG9iYWxzLCBm dXNfZ2xvYmFscykKKyAgICBTVERfUEhQX0lOSV9FTlRSWSgiZmlsZV91cGxvYWRfc3RhdHVz LmhpZGRlbl92YXJpYWJsZV9uYW1lIiwgImZpbGVfdXBsb2FkX3N0YXR1c191bmlxdWVpZCIs IFBIUF9JTklfQUxMLCBPblVwZGF0ZVN0cmluZywgaGlkZGVuX3ZhcmlhYmxlX25hbWUsIHpl bmRfZnVzX2dsb2JhbHMsIGZ1c19nbG9iYWxzKQogCiBQSFBfSU5JX0VORCgpCiAvKiB9fX0g Ki8KQEAgLTEwNjYsNiArMTA3MCw3IEBACiAJdm9pZCAqKip0c3JtX2xzOwogCiAJcGhwX2Nv cmVfZ2xvYmFscyAqY29yZV9nbG9iYWxzOworCXplbmRfZnVzX2dsb2JhbHMgKmZ1c19nbG9i YWxzOwogI2VuZGlmCiAKICNpZiBkZWZpbmVkKFBIUF9XSU4zMikgfHwgKGRlZmluZWQoTkVU V0FSRSkgJiYgZGVmaW5lZChVU0VfV0lOU09DSykpCkBAIC0xMTIwLDYgKzExMjUsNyBAQAog CWV4ZWN1dG9yX2dsb2JhbHMgPSB0c19yZXNvdXJjZShleGVjdXRvcl9nbG9iYWxzX2lkKTsK IAl0c19hbGxvY2F0ZV9pZCgmY29yZV9nbG9iYWxzX2lkLCBzaXplb2YocGhwX2NvcmVfZ2xv YmFscyksICh0c19hbGxvY2F0ZV9jdG9yKSBjb3JlX2dsb2JhbHNfY3RvciwgTlVMTCk7CiAJ Y29yZV9nbG9iYWxzID0gdHNfcmVzb3VyY2UoY29yZV9nbG9iYWxzX2lkKTsKKwlmdXNfZ2xv YmFscyA9IHRzX3Jlc291cmNlKGZ1c19nbG9iYWxzX2lkKTsKICNlbmRpZgogCUVHKGJhaWxv dXRfc2V0KSA9IDA7CiAJRUcoZXJyb3JfcmVwb3J0aW5nKSA9IEVfQUxMICYgfkVfTk9USUNF OwpJbmRleDogbWFpbi9yZmMxODY3LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3JlcG9z aXRvcnkvcGhwLXNyYy9tYWluL3JmYzE4NjcuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4x MjIuMi4yNgpkaWZmIC11IC13IC1iIC11IC1yMS4xMjIuMi4yNiByZmMxODY3LmMKLS0tIG1h aW4vcmZjMTg2Ny5jCTEzIFNlcCAyMDA0IDE2OjAwOjUwIC0wMDAwCTEuMTIyLjIuMjYKKysr IG1haW4vcmZjMTg2Ny5jCTYgTm92IDIwMDQgMDI6MjA6MjAgLTAwMDAKQEAgLTc3OSw2ICs3 NzksMTAgQEAKIAl6dmFsICphcnJheV9wdHIgPSAoenZhbCAqKSBhcmc7CiAJRklMRSAqZnA7 CiAJemVuZF9sbGlzdCBoZWFkZXI7CisJLyogZmlsZSB1cGxvYWQgc3RhdHVzIHZhcmlhYmxl cyAqLworCXplbmRfYm9vbCBmaWxlX3VwbG9hZF9zdGF0dXMgPSAwOworCWNoYXIgKmZpbGVf dXBsb2FkX3N0YXR1c19maWxlbmFtZSA9IE5VTEw7CisJRklMRSAqZmlsZV91cGxvYWRfc3Rh dHVzX2ZwOwogCiAJaWYgKFNHKHJlcXVlc3RfaW5mbykuY29udGVudF9sZW5ndGggPiBTRyhw b3N0X21heF9zaXplKSkgewogCQlzYXBpX21vZHVsZS5zYXBpX2Vycm9yKEVfV0FSTklORywg IlBPU1QgQ29udGVudC1MZW5ndGggb2YgJWxkIGJ5dGVzIGV4Y2VlZHMgdGhlIGxpbWl0IG9m ICVsZCBieXRlcyIsIFNHKHJlcXVlc3RfaW5mbykuY29udGVudF9sZW5ndGgsIFNHKHBvc3Rf bWF4X3NpemUpKTsKQEAgLTkwOCw2ICs5MTIsMTMgQEAKIAkJCQkJbWF4X2ZpbGVfc2l6ZSA9 IGF0b2wodmFsdWUpOwogCQkJCX0KIAorCQkJCS8qIENoZWNrIGZvciB1cGxvYWQgc3RhdHVz IGhpZGRlbiB2YXJpYWJsZSAqLworCQkJCWlmIChzdHJjYXNlY21wKHBhcmFtLCBGVVNHKGhp ZGRlbl92YXJpYWJsZV9uYW1lKSkgPT0gMCkgeworCQkJCQlmaWxlX3VwbG9hZF9zdGF0dXMg PSAxOworCQkJCQlmaWxlX3VwbG9hZF9zdGF0dXNfZmlsZW5hbWUgPSBlbWFsbG9jKHN0cmxl bihGVVNHKHRlbXBfZmlsZV9kaXIpKSArIHN0cmxlbihGVVNHKHRlbXBfZmlsZV9wcmVmaXgp KSArIHN0cmxlbih2YWx1ZSkgKyAyKTsKKwkJCQkJc3ByaW50ZihmaWxlX3VwbG9hZF9zdGF0 dXNfZmlsZW5hbWUsICIlcy8lcyVzIiwgRlVTRyh0ZW1wX2ZpbGVfZGlyKSwgRlVTRyh0ZW1w X2ZpbGVfcHJlZml4KSwgdmFsdWUpOworCQkJCX0KKwogCQkJCWVmcmVlKHBhcmFtKTsKIAkJ CQllZnJlZSh2YWx1ZSk7CiAJCQkJY29udGludWU7CkBAIC05OTgsOSArMTAwOSwyNyBAQAog CQkJCQkJdG90YWxfYnl0ZXMgKz0gd2xlbjsKIAkJCQkJfQogCQkJCX0gCisKKwkJCQkvKiBX cml0ZSBmaWxlIHVwbG9hZCBzdGF0dXMgdG8gZmlsZSAqLworCQkJCWlmIChmaWxlX3VwbG9h ZF9zdGF0dXMpIHsKKwkJCQkJZmlsZV91cGxvYWRfc3RhdHVzX2ZwID0gZm9wZW4oZmlsZV91 cGxvYWRfc3RhdHVzX2ZpbGVuYW1lLCAidyIpOworCQkJCQlpZihmaWxlX3VwbG9hZF9zdGF0 dXNfZnApIHsKKwkJCQkJCWZwcmludGYoZmlsZV91cGxvYWRfc3RhdHVzX2ZwLCAiJWxpICVs aSAlbGkiLCBTRyhyZWFkX3Bvc3RfYnl0ZXMpLCBTRyhyZXF1ZXN0X2luZm8pLmNvbnRlbnRf bGVuZ3RoLCAwKTsKKwkJCQkJCWZjbG9zZShmaWxlX3VwbG9hZF9zdGF0dXNfZnApOworCQkJ CQl9CisJCQkJfQogCQkJfSAKIAkJCWZjbG9zZShmcCk7CiAKKwkJCS8qIFdyaXRlIGZpbGUg dXBsb2FkICJjb21wbGV0ZSIgc3RhdHVzIHRvIGZpbGUgKi8KKwkJCWlmIChmaWxlX3VwbG9h ZF9zdGF0dXMpIHsKKwkJCQlmaWxlX3VwbG9hZF9zdGF0dXNfZnAgPSBmb3BlbihmaWxlX3Vw bG9hZF9zdGF0dXNfZmlsZW5hbWUsICJ3Iik7CisJCQkJaWYoZmlsZV91cGxvYWRfc3RhdHVz X2ZwKSB7CisJCQkJCWZwcmludGYoZmlsZV91cGxvYWRfc3RhdHVzX2ZwLCAiJWxpICVsaSAl bGkiLFNHKHJlYWRfcG9zdF9ieXRlcyksIFNHKHJlcXVlc3RfaW5mbykuY29udGVudF9sZW5n dGgsMSk7CisJCQkJCWZjbG9zZShmaWxlX3VwbG9hZF9zdGF0dXNfZnApOworCQkJCX0KKwkJ CX0KKwogI2lmZGVmIERFQlVHX0ZJTEVfVVBMT0FECiAJCQlpZihzdHJsZW4oZmlsZW5hbWUp ID4gMCAmJiB0b3RhbF9ieXRlcyA9PSAwKSB7CiAJCQkJc2FwaV9tb2R1bGUuc2FwaV9lcnJv cihFX1dBUk5JTkcsICJVcGxvYWRlZCBmaWxlIHNpemUgMCAtIGZpbGUgWyVzPSVzXSBub3Qg c2F2ZWQiLCBwYXJhbSwgZmlsZW5hbWUpOwpAQCAtMTAyNCw2ICsxMDUzLDExIEBACiAJCQkg Ki8KIAkJCWlzX2Fycl91cGxvYWQgPQkoc3RhcnRfYXJyID0gc3RyY2hyKHBhcmFtLCdbJykp ICYmIChwYXJhbVtzdHJsZW4ocGFyYW0pLTFdID09ICddJyk7CiAKKwkJCS8qIGhhbmRsZSB1 bnRlcm1pbmF0ZWQgWyAqLworCQkJaWYgKCFpc19hcnJfdXBsb2FkICYmIHN0YXJ0X2Fycikg eworCQkJCSpzdGFydF9hcnIgPSAnXyc7CisJCQl9CisKIAkJCWlmIChpc19hcnJfdXBsb2Fk KSB7CiAJCQkJYXJyYXlfbGVuID0gc3RybGVuKHN0YXJ0X2Fycik7CiAJCQkJaWYgKGFycmF5 X2luZGV4KSB7CkluZGV4OiBzYXBpL2NsaS9waHBfY2xpLmMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL3JlcG9zaXRvcnkvcGhwLXNyYy9zYXBpL2NsaS9waHBfY2xpLmMsdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuNTEuMi4zNQpkaWZmIC11IC13IC1iIC11IC1yMS41MS4yLjM1IHBo cF9jbGkuYwotLS0gc2FwaS9jbGkvcGhwX2NsaS5jCTE0IEp1bCAyMDA0IDIyOjM4OjE4IC0w MDAwCTEuNTEuMi4zNQorKysgc2FwaS9jbGkvcGhwX2NsaS5jCTYgTm92IDIwMDQgMDI6NTY6 MTggLTAwMDAKQEAgLTUxNyw2ICs1MTcsNyBAQAogCXplbmRfZXhlY3V0b3JfZ2xvYmFscyAq ZXhlY3V0b3JfZ2xvYmFsczsKIAlwaHBfY29yZV9nbG9iYWxzICpjb3JlX2dsb2JhbHM7CiAJ c2FwaV9nbG9iYWxzX3N0cnVjdCAqc2FwaV9nbG9iYWxzOworCXplbmRfZnVzX2dsb2JhbHMg KmZ1c19nbG9iYWxzOwogCXZvaWQgKioqdHNybV9sczsKICNlbmRpZgogCkBAIC01NjksNiAr NTcwLDcgQEAKIAlleGVjdXRvcl9nbG9iYWxzID0gdHNfcmVzb3VyY2UoZXhlY3V0b3JfZ2xv YmFsc19pZCk7CiAJY29yZV9nbG9iYWxzID0gdHNfcmVzb3VyY2UoY29yZV9nbG9iYWxzX2lk KTsKIAlzYXBpX2dsb2JhbHMgPSB0c19yZXNvdXJjZShzYXBpX2dsb2JhbHNfaWQpOworCWZ1 c19nbG9iYWxzID0gdHNfcmVzb3VyY2UoZnVzX2dsb2JhbHNfaWQpOwogCXRzcm1fbHMgPSB0 c19yZXNvdXJjZSgwKTsKICNlbmRpZgogCg== ------------1229B1CD126B94FD--