12418 2007-07-30 16:19:56 +0400 Ark показывает в zip-архивах обрезанные имена файлов в кириллице 2008-01-15 02:45:58 +0300 1 1 4 Development Sisyphus kdeutils-ark unstable all Linux CLOSED FIXED P2 blocker --- 12313 1 cas zerg lav rom_as qa-sisyphus oldest_to_newest 53315 0 cas 2007-07-30 16:19:56 +0400 Если в архиве zip есть файлы с кириллицей, они нормально показываются в консоли и file-roller. В Ark (как отдельном окне, так и KPart) показывается обрезанное имя (вместо 'проверка.txt' -> 'провер' в отдельном окне и сырой UTF-8 в KPart). Извлечение завершается ошибкой. Для архивов RAR и 7Zip - всё работает без проблем. 54159 1 2149 stanv 2007-08-15 15:43:54 +0400 Created attachment 2149 please test this patch 54208 2 2154 stanv 2007-08-16 15:09:04 +0400 Created attachment 2154 use only this one 1. Не обрезает имена файлов в ark. 2. При правый клик -> "Просмотр в Архиватор" отображает имена файлов как выдает unzip. 54309 3 zerg 2007-08-20 17:23:10 +0400 kdeutils-ark-3.5.7-alt3 2149 2007-08-15 15:43:54 +0400 2007-08-15 15:43:54 +0400 please test this patch alt_ark_processLine.diff text/plain 851 stanv ZGlmZiAtcnVOIGtkZXV0aWxzLTMuNS43LW9yaWdpbmFsL2Fyay9hcmNoLmNwcCBrZGV1dGlscy0z LjUuNy1tb2RpZmllZC9hcmsvYXJjaC5jcHAKLS0tIGtkZXV0aWxzLTMuNS43LW9yaWdpbmFsL2Fy ay9hcmNoLmNwcAkyMDA2LTEwLTAxIDIxOjI4OjE1ICswNDAwCisrKyBrZGV1dGlscy0zLjUuNy1t b2RpZmllZC9hcmsvYXJjaC5jcHAJMjAwNy0wOC0xNSAxNTowNzo0NSArMDQwMApAQCAtMzAzLDYg KzMwMyw3IEBACiBib29sIEFyY2g6OnByb2Nlc3NMaW5lKCBjb25zdCBRQ1N0cmluZyAmbGluZSAp CiB7CiAgIFFTdHJpbmcgY29sdW1uc1sgMTEgXTsKKyAgUVN0cmluZyB1bmljb2RlX2xpbmUobGlu ZSk7CiAgIHVuc2lnbmVkIGludCBwb3MgPSAwOwogICBpbnQgc3RycG9zLCBsZW47CiAKQEAgLTMx MSw3ICszMTIsNyBAQAogICB7CiAgICAgQXJjaENvbHVtbnMgKmN1ckNvbCA9ICpjb2w7CiAKLSAg ICBzdHJwb3MgPSBjdXJDb2wtPnBhdHRlcm4uc2VhcmNoKCBsaW5lLCBwb3MgKTsKKyAgICBzdHJw b3MgPSBjdXJDb2wtPnBhdHRlcm4uc2VhcmNoKCB1bmljb2RlX2xpbmUsIHBvcyApOwogICAgIGxl biA9IGN1ckNvbC0+cGF0dGVybi5tYXRjaGVkTGVuZ3RoKCk7CiAKICAgICBpZiAoICggc3RycG9z ID09IC0xICkgfHwgKCBsZW4gPiBjdXJDb2wtPm1heExlbmd0aCApICkKQEAgLTMyNyw3ICszMjgs NyBAQAogCiAgICAgcG9zID0gc3RycG9zICsgbGVuOwogCi0gICAgY29sdW1uc1sgY3VyQ29sLT5j b2xSZWYgXSA9IGxpbmUubWlkKCBzdHJwb3MsIGxlbiApOworICAgIGNvbHVtbnNbIGN1ckNvbC0+ Y29sUmVmIF0gPSB1bmljb2RlX2xpbmUubWlkKCBzdHJwb3MsIGxlbiApOwogICB9CiAKIAo= 2154 2007-08-16 15:09:04 +0400 2007-08-16 15:09:04 +0400 use only this one alt_ark_zip_rar.diff text/plain 4390 stanv ZGlmZiAtcnVOIGtkZXV0aWxzLTMuNS43LW9yaWdpbmFsL2Fyay9hcmNoLmNwcCBrZGV1dGlscy0z LjUuNy9hcmsvYXJjaC5jcHAKLS0tIGtkZXV0aWxzLTMuNS43LW9yaWdpbmFsL2Fyay9hcmNoLmNw cAkyMDA2LTEwLTAxIDIxOjI4OjE1ICswNDAwCisrKyBrZGV1dGlscy0zLjUuNy9hcmsvYXJjaC5j cHAJMjAwNy0wOC0xNiAxMToxNjo1MiArMDQwMApAQCAtMzMsNiArMzMsNyBAQAogLy8gUVQgaW5j bHVkZXMKICNpbmNsdWRlIDxxYXBwbGljYXRpb24uaD4KICNpbmNsdWRlIDxxZmlsZS5oPgorI2lu Y2x1ZGUgPHF0ZXh0Y29kZWMuaD4KIAogLy8gS0RFIGluY2x1ZGVzCiAjaW5jbHVkZSA8a2RlYnVn Lmg+CkBAIC0zMDMsMTUgKzMwNCwyMCBAQAogYm9vbCBBcmNoOjpwcm9jZXNzTGluZSggY29uc3Qg UUNTdHJpbmcgJmxpbmUgKQogewogICBRU3RyaW5nIGNvbHVtbnNbIDExIF07CisgIFFTdHJpbmcg dW5pY29kZV9saW5lOwogICB1bnNpZ25lZCBpbnQgcG9zID0gMDsKICAgaW50IHN0cnBvcywgbGVu OwogCisgIFFUZXh0Q29kZWMgKmNvZGVjID0gUVRleHRDb2RlYzo6Y29kZWNGb3JMb2NhbGUoKTsK KyAgdW5pY29kZV9saW5lID0gY29kZWMtPnRvVW5pY29kZSggbGluZSApOworCisKICAgLy8gR28g dGhyb3VnaCBvdXIgY29sdW1ucywgdHJ5IHRvIHBpY2sgb3V0IGRhdGEsIHJldHVybiBzaWxlbnRs eSBvbiBmYWlsdXJlCiAgIGZvciAoIFFQdHJMaXN0SXRlcmF0b3IgPEFyY2hDb2x1bW5zPmNvbCgg bV9hcmNoQ29scyApOyBjb2wuY3VycmVudCgpOyArK2NvbCApCiAgIHsKICAgICBBcmNoQ29sdW1u cyAqY3VyQ29sID0gKmNvbDsKIAotICAgIHN0cnBvcyA9IGN1ckNvbC0+cGF0dGVybi5zZWFyY2go IGxpbmUsIHBvcyApOworICAgIHN0cnBvcyA9IGN1ckNvbC0+cGF0dGVybi5zZWFyY2goIHVuaWNv ZGVfbGluZSwgcG9zICk7CiAgICAgbGVuID0gY3VyQ29sLT5wYXR0ZXJuLm1hdGNoZWRMZW5ndGgo KTsKIAogICAgIGlmICggKCBzdHJwb3MgPT0gLTEgKSB8fCAoIGxlbiA+IGN1ckNvbC0+bWF4TGVu Z3RoICkgKQpAQCAtMzI3LDcgKzMzMyw3IEBACiAKICAgICBwb3MgPSBzdHJwb3MgKyBsZW47CiAK LSAgICBjb2x1bW5zWyBjdXJDb2wtPmNvbFJlZiBdID0gbGluZS5taWQoIHN0cnBvcywgbGVuICk7 CisgICAgY29sdW1uc1sgY3VyQ29sLT5jb2xSZWYgXSA9IHVuaWNvZGVfbGluZS5taWQoIHN0cnBv cywgbGVuICk7CiAgIH0KIAogCmRpZmYgLXJ1TiBrZGV1dGlscy0zLjUuNy1vcmlnaW5hbC9hcmsv YXJrd2lkZ2V0LmNwcCBrZGV1dGlscy0zLjUuNy9hcmsvYXJrd2lkZ2V0LmNwcAotLS0ga2RldXRp bHMtMy41Ljctb3JpZ2luYWwvYXJrL2Fya3dpZGdldC5jcHAJMjAwNy0wNS0xNCAxMTo0MDo0NiAr MDQwMAorKysga2RldXRpbHMtMy41LjcvYXJrL2Fya3dpZGdldC5jcHAJMjAwNy0wOC0xNiAxMjo1 NzowNyArMDQwMApAQCAtMTUyNiw3ICsxNTI2LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICBp dCAhPSBzZWxlY3RlZEZpbGVzLmNvbnN0RW5kKCk7CiAgICAgICAgICAgICAgICAgICAgICAgKytp dCApCiAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBtX2V4dHJhY3RMaXN0 LT5hcHBlbmQoIFFGaWxlOjplbmNvZGVOYW1lKCAqaXQgKSApOworICAgICAgICAgICAgICAgICAg ICBtX2V4dHJhY3RMaXN0LT5hcHBlbmQoICppdCApOwogICAgICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgICAgIGlmICghYk92d3J0KQpkaWZmIC1ydU4ga2RldXRpbHMtMy41Ljctb3JpZ2lu YWwvYXJrL3Jhci5jcHAga2RldXRpbHMtMy41LjcvYXJrL3Jhci5jcHAKLS0tIGtkZXV0aWxzLTMu NS43LW9yaWdpbmFsL2Fyay9yYXIuY3BwCTIwMDYtMDUtMjIgMjI6MDg6MzggKzA0MDAKKysrIGtk ZXV0aWxzLTMuNS43L2Fyay9yYXIuY3BwCTIwMDctMDgtMTYgMTE6MTc6MDggKzA0MDAKQEAgLTMy LDYgKzMyLDcgQEAKIC8vIFFUIGluY2x1ZGVzCiAjaW5jbHVkZSA8cWZpbGUuaD4KICNpbmNsdWRl IDxxZGlyLmg+CisjaW5jbHVkZSA8cXRleHRjb2RlYy5oPgogCiAvLyBLREUgaW5jbHVkZXMKICNp bmNsdWRlIDxrZGVidWcuaD4KQEAgLTgwLDkgKzgxLDE0IEBACiAKIGJvb2wgUmFyQXJjaDo6cHJv Y2Vzc0xpbmUoIGNvbnN0IFFDU3RyaW5nICZsaW5lICkKIHsKKyAgUVN0cmluZyB1bmljb2RlX2xp bmU7CisKKyAgUVRleHRDb2RlYyAqY29kZWMgPSBRVGV4dENvZGVjOjpjb2RlY0ZvckxvY2FsZSgp OworICB1bmljb2RlX2xpbmUgPSBjb2RlYy0+dG9Vbmljb2RlKCBsaW5lICk7CisgIAogICBpZiAo IG1faXNGaXJzdExpbmUgKQogICB7Ci0gICAgbV9lbnRyeUZpbGVuYW1lID0gbGluZTsKKyAgICBt X2VudHJ5RmlsZW5hbWUgPSB1bmljb2RlX2xpbmU7CiAgICAgbV9lbnRyeUZpbGVuYW1lLnJlbW92 ZSggMCwgMSApOwogICAgIG1faXNGaXJzdExpbmUgPSBmYWxzZTsKICAgICByZXR1cm4gdHJ1ZTsK QEAgLTkwLDcgKzk2LDcgQEAKIAogICBRU3RyaW5nTGlzdCBsaXN0OwogCi0gIFFTdHJpbmdMaXN0 IGwyID0gUVN0cmluZ0xpc3Q6OnNwbGl0KCAnICcsIGxpbmUgKTsKKyAgUVN0cmluZ0xpc3QgbDIg PSBRU3RyaW5nTGlzdDo6c3BsaXQoICcgJywgdW5pY29kZV9saW5lICk7CiAKICAgbGlzdCA8PCBt X2VudHJ5RmlsZW5hbWU7IC8vIGZpbGVuYW1lCiAgIGxpc3QgPDwgbDJbIDAgXTsgLy8gc2l6ZQpA QCAtMjM1LDggKzI0MSwxMCBAQAogICB7CiAgICAgKmtwIDw8ICItby0iOwogICB9CisgIAorICBR VGV4dENvZGVjICpjb2RlYyA9IFFUZXh0Q29kZWM6OmNvZGVjRm9yTG9jYWxlKCk7CiAKLSAgKmtw IDw8IG1fZmlsZW5hbWU7CisgICprcCA8PCBjb2RlYy0+ZnJvbVVuaWNvZGUobV9maWxlbmFtZSk7 CiAKICAgLy8gaWYgdGhlIGZpbGUgbGlzdCBpcyBlbXB0eSwgbm8gZmlsZW5hbWVzIGdvIG9uIHRo ZSBjb21tYW5kIGxpbmUsCiAgIC8vIGFuZCB3ZSB0aGVuIGV4dHJhY3QgZXZlcnl0aGluZyBpbiB0 aGUgYXJjaGl2ZS4KQEAgLTI0NSwxMSArMjUzLDExIEBACiAgICAgUVN0cmluZ0xpc3Q6Okl0ZXJh dG9yIGl0OwogICAgIGZvciAoIGl0ID0gbV9maWxlTGlzdC0+YmVnaW4oKTsgaXQgIT0gbV9maWxl TGlzdC0+ZW5kKCk7ICsraXQgKQogICAgIHsKLSAgICAgICprcCA8PCAoKml0KTsKKyAgICAgICpr cCA8PCBjb2RlYy0+ZnJvbVVuaWNvZGUoKml0KTsKICAgICB9CiAgIH0KIAotICAqa3AgPDwgbV9k ZXN0RGlyIDsKKyAgKmtwIDw8IGNvZGVjLT5mcm9tVW5pY29kZShtX2Rlc3REaXIpOwogCiAgIGNv bm5lY3QoIGtwLCBTSUdOQUwoIHJlY2VpdmVkU3Rkb3V0KEtQcm9jZXNzKiwgY2hhciosIGludCkg KSwKICAgICAgICAgICAgU0xPVCggc2xvdFJlY2VpdmVkT3V0cHV0KEtQcm9jZXNzKiwgY2hhcios IGludCkgKSApOwpkaWZmIC1ydU4ga2RldXRpbHMtMy41Ljctb3JpZ2luYWwvYXJrL3ppcC5jcHAg a2RldXRpbHMtMy41LjcvYXJrL3ppcC5jcHAKLS0tIGtkZXV0aWxzLTMuNS43LW9yaWdpbmFsL2Fy ay96aXAuY3BwCTIwMDctMDEtMTUgMTQ6MjU6MzcgKzAzMDAKKysrIGtkZXV0aWxzLTMuNS43L2Fy ay96aXAuY3BwCTIwMDctMDgtMTYgMTI6NDE6MDIgKzA0MDAKQEAgLTI4LDYgKzI4LDcgQEAKIAog Ly8gUXQgaW5jbHVkZXMKICNpbmNsdWRlIDxxZGlyLmg+CisjaW5jbHVkZSA8cXRleHRjb2RlYy5o PgogCiAvLyBLREUgaW5jbHVkZXMKICNpbmNsdWRlIDxrZGVidWcuaD4KQEAgLTIwNyw4ICsyMDgs MTAgQEAKICAgICAqa3AgPDwgIi1vIjsKICAgZWxzZQogICAgICprcCA8PCAiLW4iOworICAKKyAg UVRleHRDb2RlYyAqY29kZWMgPSBRVGV4dENvZGVjOjpjb2RlY0ZvckxvY2FsZSgpOwogCi0gICpr cCA8PCBtX2ZpbGVuYW1lOworICAqa3AgPDwgY29kZWMtPmZyb21Vbmljb2RlKG1fZmlsZW5hbWUp OwogCiAgIC8vIGlmIHRoZSBsaXN0IGlzIGVtcHR5LCBubyBmaWxlbmFtZXMgZ28gb24gdGhlIGNv bW1hbmQgbGluZSwKICAgLy8gYW5kIHdlIHRoZW4gZXh0cmFjdCBldmVyeXRoaW5nIGluIHRoZSBh cmNoaXZlLgpAQCAtMjE4LDExICsyMjEsMTIgQEAKIAogICAgIGZvciAoIGl0ID0gbV9maWxlTGlz dC0+YmVnaW4oKTsgaXQgIT0gbV9maWxlTGlzdC0+ZW5kKCk7ICsraXQgKQogICAgIHsKLSAgICAg ICprcCA8PCAoKml0KTsKKyAgICAgICprcCA8PCBjb2RlYy0+ZnJvbVVuaWNvZGUoKml0KTsKICAg ICB9CiAgIH0KIAotICAqa3AgPDwgIi1kIiA8PCBtX2Rlc3REaXI7CisgICprcCA8PCAiLWQiOwor ICAqa3AgPDwgY29kZWMtPmZyb21Vbmljb2RlKG1fZGVzdERpcik7CiAKICAgY29ubmVjdCgga3As IFNJR05BTCggcmVjZWl2ZWRTdGRvdXQoS1Byb2Nlc3MqLCBjaGFyKiwgaW50KSApLAogICAgICAg ICAgICBTTE9UKCBzbG90UmVjZWl2ZWRPdXRwdXQoS1Byb2Nlc3MqLCBjaGFyKiwgaW50KSApICk7 Cg==