10851 2007-02-16 17:01:04 +0300 [FR] fix behaviour in 8-bit locales with cyrillic filenames 2011-03-24 15:26:05 +0300 1 1 4 Development Sisyphus file-roller unstable all Linux CLOSED WONTFIX P2 enhancement --- 1 mike aris aris imz qa-sisyphus oldest_to_newest 45421 0 mike 2007-02-16 17:01:05 +0300 It was long observed that file-roller would work OK with both cyrillic archive filenames and their content names, but mess up Location: bar in non-UTF8 locales like ru_RU.KOI8-R and refuse to accept non-UTF8 names as command line arguments. The patch for the former part of a problem is attached (verified); I'm trying to fix the latter too but for now seems like I can break more than fix. 2 lav: thanks for http://www.freesource.info/wiki/Lokalizacija/LokalizacijaProgramm#h323-5 2 eostapets: thunar-archive-plugin would try to pass filename argument to file-roller (nice "plugin", heh) and fail if it's not UTF. So you might be interested too ;) 45422 1 1805 mike 2007-02-16 17:07:52 +0300 Created attachment 1805 initial fix (Location only but tested) UTF8 test passed for me too 45425 2 mike 2007-02-16 19:01:57 +0300 I've kludged around opening archives from commandline but it's sort of band-aid -- window title, recent files and archive creation are broken (in non-utf setup). 45426 3 ktirf 2007-02-16 19:04:47 +0300 Passing on to an actual (so far) maintainer. 45427 4 1806 mike 2007-02-16 19:06:42 +0300 Created attachment 1806 previous patch plus one more kludgy chunk This sort of fixes opening cyrillic named archives from commandline but should definitely break something and is incomplete anyways: window title, recent files and archive _creation_ aren't cared for at all. Actually it might make sense to have window->locale_filename, no? 68223 5 mike 2008-04-13 13:29:03 +0400 WONTFIX? 105209 6 mike 2010-01-06 20:56:08 +0300 *** Bug 22462 has been marked as a duplicate of this bug. *** 119456 7 mike 2011-03-24 15:26:05 +0300 APPARENTLY. 1805 2007-02-16 17:07:52 +0300 2007-02-16 17:07:52 +0300 initial fix (Location only but tested) file-roller-2.16.3-alt-8bit-paths.patch text/plain 2606 mike ZGlmZiAtTmF1ciBmaWxlLXJvbGxlci0yLjE2LjMtb3JpZy9zcmMvd2luZG93LmMgZmlsZS1yb2xs ZXItMi4xNi4zL3NyYy93aW5kb3cuYwotLS0gZmlsZS1yb2xsZXItMi4xNi4zLW9yaWcvc3JjL3dp bmRvdy5jCTIwMDctMDEtMjkgMjM6MDQ6MDAgKzAyMDAKKysrIGZpbGUtcm9sbGVyLTIuMTYuMy9z cmMvd2luZG93LmMJMjAwNy0wMi0xNiAxNToxNjoxNSArMDIwMApAQCAtMTEzOSw2ICsxMTM5LDIx IEBACiBfd2luZG93X3VwZGF0ZV9jdXJyZW50X2xvY2F0aW9uIChGUldpbmRvdyAqd2luZG93KQog ewogCWNvbnN0IGNoYXIgKmN1cnJlbnRfZGlyID0gd2luZG93X2dldF9jdXJyZW50X2xvY2F0aW9u ICh3aW5kb3cpOworCS8qIG5vbi04Yml0IHBhdGggaGFuZGxpbmcgcm91Z2hseSBib3Jyb3dlZCBm cm9tIERpYTsKKwkgKiB0aGFua3MgYW4gZXhhbXBsZS9kb2NzIGJ5IFZpdGFseSBMaXBhdG92IChl dGVyc29mdC5ydSkKKwkgKi8KKwljaGFyIGJ1ZmZlclszMDBdOworCWNoYXIgKnV0ZjhjdXJyZW50 X2RpciA9IE5VTEw7CisKKwlpZiAoIWdfdXRmOF92YWxpZGF0ZShjdXJyZW50X2RpciwgLTEsIE5V TEwpKSB7CisJCXV0ZjhjdXJyZW50X2RpciA9IGdfZmlsZW5hbWVfdG9fdXRmOChjdXJyZW50X2Rp ciwgLTEsIE5VTEwsIE5VTEwsIE5VTEwpOworCQlpZiAodXRmOGN1cnJlbnRfZGlyID09IE5VTEwp IHsKKwkJCWdfd2FybmluZyhfKCJTb21lIGNoYXJhY3RlcnMgaW4gdGhlIGN1cnJlbnQgcGF0aCBh cmUgbmVpdGhlciBVVEYtOCBub3IgeW91ciBsb2NhbCBlbmNvZGluZyIpKTsKKwkJfQorCX0KKwlp ZiAodXRmOGN1cnJlbnRfZGlyID09IE5VTEwpCisJCXV0ZjhjdXJyZW50X2RpciA9IGdfc3RyZHVw KGN1cnJlbnRfZGlyKTsKKwlnX3NucHJpbnRmKGJ1ZmZlciwgMzAwLCAiJXMiLCB1dGY4Y3VycmVu dF9kaXIpOwogCiAJaWYgKHdpbmRvdy0+bGlzdF9tb2RlID09IFdJTkRPV19MSVNUX01PREVfRkxB VCkgewogCQlndGtfd2lkZ2V0X2hpZGUgKHdpbmRvdy0+bG9jYXRpb25fYmFyKTsKQEAgLTExNDcs MTQgKzExNjIsMTYgQEAKIAogCWd0a193aWRnZXRfc2hvdyAod2luZG93LT5sb2NhdGlvbl9iYXIp OwogCi0JZ3RrX2VudHJ5X3NldF90ZXh0IChHVEtfRU5UUlkgKHdpbmRvdy0+bG9jYXRpb25fZW50 cnkpLCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudD8gY3VycmVudF9kaXI6ICIiKTsKKwlndGtfZW50 cnlfc2V0X3RleHQgKEdUS19FTlRSWSAod2luZG93LT5sb2NhdGlvbl9lbnRyeSksIHdpbmRvdy0+ YXJjaGl2ZV9wcmVzZW50PyB1dGY4Y3VycmVudF9kaXI6ICIiKTsKIAlndGtfd2lkZ2V0X3NldF9z ZW5zaXRpdmUgKHdpbmRvdy0+aG9tZV9idXR0b24sIHdpbmRvdy0+YXJjaGl2ZV9wcmVzZW50KTsK LQlndGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUgKHdpbmRvdy0+dXBfYnV0dG9uLCB3aW5kb3ctPmFy Y2hpdmVfcHJlc2VudCAmJiAoY3VycmVudF9kaXIgIT0gTlVMTCkgJiYgKHN0cmNtcCAoY3VycmVu dF9kaXIsICIvIikgIT0gMCkpOwotCWd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSAod2luZG93LT5i YWNrX2J1dHRvbiwgd2luZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKGN1cnJlbnRfZGlyICE9IE5V TEwpICYmICh3aW5kb3ctPmhpc3RvcnlfY3VycmVudCAhPSBOVUxMKSAmJiAod2luZG93LT5oaXN0 b3J5X2N1cnJlbnQtPm5leHQgIT0gTlVMTCkpOwotCWd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSAo d2luZG93LT5md2RfYnV0dG9uLCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudCAmJiAoY3VycmVudF9k aXIgIT0gTlVMTCkgJiYgKHdpbmRvdy0+aGlzdG9yeV9jdXJyZW50ICE9IE5VTEwpICYmICh3aW5k b3ctPmhpc3RvcnlfY3VycmVudC0+cHJldiAhPSBOVUxMKSk7CisJZ3RrX3dpZGdldF9zZXRfc2Vu c2l0aXZlICh3aW5kb3ctPnVwX2J1dHRvbiwgd2luZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKHV0 ZjhjdXJyZW50X2RpciAhPSBOVUxMKSAmJiAoc3RyY21wICh1dGY4Y3VycmVudF9kaXIsICIvIikg IT0gMCkpOworCWd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSAod2luZG93LT5iYWNrX2J1dHRvbiwg d2luZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKHV0ZjhjdXJyZW50X2RpciAhPSBOVUxMKSAmJiAo d2luZG93LT5oaXN0b3J5X2N1cnJlbnQgIT0gTlVMTCkgJiYgKHdpbmRvdy0+aGlzdG9yeV9jdXJy ZW50LT5uZXh0ICE9IE5VTEwpKTsKKwlndGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUgKHdpbmRvdy0+ ZndkX2J1dHRvbiwgd2luZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKHV0ZjhjdXJyZW50X2RpciAh PSBOVUxMKSAmJiAod2luZG93LT5oaXN0b3J5X2N1cnJlbnQgIT0gTlVMTCkgJiYgKHdpbmRvdy0+ aGlzdG9yeV9jdXJyZW50LT5wcmV2ICE9IE5VTEwpKTsKIAlndGtfd2lkZ2V0X3NldF9zZW5zaXRp dmUgKHdpbmRvdy0+bG9jYXRpb25fZW50cnksIHdpbmRvdy0+YXJjaGl2ZV9wcmVzZW50KTsKIAln dGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUgKHdpbmRvdy0+bG9jYXRpb25fbGFiZWwsIHdpbmRvdy0+ YXJjaGl2ZV9wcmVzZW50KTsKIAorCWdfZnJlZSh1dGY4Y3VycmVudF9kaXIpOworCiAjaWYgMAog CV93aW5kb3dfaGlzdG9yeV9wcmludCAod2luZG93KTsKICNlbmRpZgo= 1806 2007-02-16 19:06:42 +0300 2007-02-16 19:06:42 +0300 previous patch plus one more kludgy chunk file-roller-2.16.3-alt-8bit+1morehack.patch text/plain 3565 mike LS0tIGZpbGUtcm9sbGVyLTIuMTYuMy1vcmlnL3NyYy93aW5kb3cuYwkyMDA3LTAxLTI5IDIzOjA0 OjAwICswMjAwCisrKyBmaWxlLXJvbGxlci0yLjE2LjMvc3JjL3dpbmRvdy5jCTIwMDctMDItMTYg MTc6NDE6MDEgKzAyMDAKQEAgLTExMzksNiArMTEzOSwyMSBAQAogX3dpbmRvd191cGRhdGVfY3Vy cmVudF9sb2NhdGlvbiAoRlJXaW5kb3cgKndpbmRvdykKIHsKIAljb25zdCBjaGFyICpjdXJyZW50 X2RpciA9IHdpbmRvd19nZXRfY3VycmVudF9sb2NhdGlvbiAod2luZG93KTsKKwkvKiBub24tOGJp dCBwYXRoIGhhbmRsaW5nIHJvdWdobHkgYm9ycm93ZWQgZnJvbSBEaWE7CisJICogdGhhbmtzIGFu IGV4YW1wbGUvZG9jcyBieSBWaXRhbHkgTGlwYXRvdiAoZXRlcnNvZnQucnUpCisJICovCisJY2hh ciBidWZmZXJbMzAwXTsKKwljaGFyICp1dGY4Y3VycmVudF9kaXIgPSBOVUxMOworCisJaWYgKCFn X3V0ZjhfdmFsaWRhdGUoY3VycmVudF9kaXIsIC0xLCBOVUxMKSkgeworCQl1dGY4Y3VycmVudF9k aXIgPSBnX2ZpbGVuYW1lX3RvX3V0ZjgoY3VycmVudF9kaXIsIC0xLCBOVUxMLCBOVUxMLCBOVUxM KTsKKwkJaWYgKHV0ZjhjdXJyZW50X2RpciA9PSBOVUxMKSB7CisJCQlnX3dhcm5pbmcoXygiU29t ZSBjaGFyYWN0ZXJzIGluIHRoZSBjdXJyZW50IHBhdGggYXJlIG5laXRoZXIgVVRGLTggbm9yIHlv dXIgbG9jYWwgZW5jb2RpbmciKSk7CisJCX0KKwl9CisJaWYgKHV0ZjhjdXJyZW50X2RpciA9PSBO VUxMKQorCQl1dGY4Y3VycmVudF9kaXIgPSBnX3N0cmR1cChjdXJyZW50X2Rpcik7CisJZ19zbnBy aW50ZihidWZmZXIsIDMwMCwgIiVzIiwgdXRmOGN1cnJlbnRfZGlyKTsKIAogCWlmICh3aW5kb3ct Pmxpc3RfbW9kZSA9PSBXSU5ET1dfTElTVF9NT0RFX0ZMQVQpIHsKIAkJZ3RrX3dpZGdldF9oaWRl ICh3aW5kb3ctPmxvY2F0aW9uX2Jhcik7CkBAIC0xMTQ3LDE0ICsxMTYyLDE2IEBACiAKIAlndGtf d2lkZ2V0X3Nob3cgKHdpbmRvdy0+bG9jYXRpb25fYmFyKTsKIAotCWd0a19lbnRyeV9zZXRfdGV4 dCAoR1RLX0VOVFJZICh3aW5kb3ctPmxvY2F0aW9uX2VudHJ5KSwgd2luZG93LT5hcmNoaXZlX3By ZXNlbnQ/IGN1cnJlbnRfZGlyOiAiIik7CisJZ3RrX2VudHJ5X3NldF90ZXh0IChHVEtfRU5UUlkg KHdpbmRvdy0+bG9jYXRpb25fZW50cnkpLCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudD8gdXRmOGN1 cnJlbnRfZGlyOiAiIik7CiAJZ3RrX3dpZGdldF9zZXRfc2Vuc2l0aXZlICh3aW5kb3ctPmhvbWVf YnV0dG9uLCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudCk7Ci0JZ3RrX3dpZGdldF9zZXRfc2Vuc2l0 aXZlICh3aW5kb3ctPnVwX2J1dHRvbiwgd2luZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKGN1cnJl bnRfZGlyICE9IE5VTEwpICYmIChzdHJjbXAgKGN1cnJlbnRfZGlyLCAiLyIpICE9IDApKTsKLQln dGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUgKHdpbmRvdy0+YmFja19idXR0b24sIHdpbmRvdy0+YXJj aGl2ZV9wcmVzZW50ICYmIChjdXJyZW50X2RpciAhPSBOVUxMKSAmJiAod2luZG93LT5oaXN0b3J5 X2N1cnJlbnQgIT0gTlVMTCkgJiYgKHdpbmRvdy0+aGlzdG9yeV9jdXJyZW50LT5uZXh0ICE9IE5V TEwpKTsKLQlndGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUgKHdpbmRvdy0+ZndkX2J1dHRvbiwgd2lu ZG93LT5hcmNoaXZlX3ByZXNlbnQgJiYgKGN1cnJlbnRfZGlyICE9IE5VTEwpICYmICh3aW5kb3ct Pmhpc3RvcnlfY3VycmVudCAhPSBOVUxMKSAmJiAod2luZG93LT5oaXN0b3J5X2N1cnJlbnQtPnBy ZXYgIT0gTlVMTCkpOworCWd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSAod2luZG93LT51cF9idXR0 b24sIHdpbmRvdy0+YXJjaGl2ZV9wcmVzZW50ICYmICh1dGY4Y3VycmVudF9kaXIgIT0gTlVMTCkg JiYgKHN0cmNtcCAodXRmOGN1cnJlbnRfZGlyLCAiLyIpICE9IDApKTsKKwlndGtfd2lkZ2V0X3Nl dF9zZW5zaXRpdmUgKHdpbmRvdy0+YmFja19idXR0b24sIHdpbmRvdy0+YXJjaGl2ZV9wcmVzZW50 ICYmICh1dGY4Y3VycmVudF9kaXIgIT0gTlVMTCkgJiYgKHdpbmRvdy0+aGlzdG9yeV9jdXJyZW50 ICE9IE5VTEwpICYmICh3aW5kb3ctPmhpc3RvcnlfY3VycmVudC0+bmV4dCAhPSBOVUxMKSk7CisJ Z3RrX3dpZGdldF9zZXRfc2Vuc2l0aXZlICh3aW5kb3ctPmZ3ZF9idXR0b24sIHdpbmRvdy0+YXJj aGl2ZV9wcmVzZW50ICYmICh1dGY4Y3VycmVudF9kaXIgIT0gTlVMTCkgJiYgKHdpbmRvdy0+aGlz dG9yeV9jdXJyZW50ICE9IE5VTEwpICYmICh3aW5kb3ctPmhpc3RvcnlfY3VycmVudC0+cHJldiAh PSBOVUxMKSk7CiAJZ3RrX3dpZGdldF9zZXRfc2Vuc2l0aXZlICh3aW5kb3ctPmxvY2F0aW9uX2Vu dHJ5LCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudCk7CiAJZ3RrX3dpZGdldF9zZXRfc2Vuc2l0aXZl ICh3aW5kb3ctPmxvY2F0aW9uX2xhYmVsLCB3aW5kb3ctPmFyY2hpdmVfcHJlc2VudCk7CiAKKwln X2ZyZWUodXRmOGN1cnJlbnRfZGlyKTsKKwogI2lmIDAKIAlfd2luZG93X2hpc3RvcnlfcHJpbnQg KHdpbmRvdyk7CiAjZW5kaWYKQEAgLTQzNjgsMTEgKzQzODUsMjEgQEAKIAl9IGVsc2UKIAkJd2lu ZG93LT5hcmNoaXZlX2ZpbGVuYW1lID0gZ19zdHJkdXAgKGZpbGVuYW1lKTsKIAorCWNoYXIgYnVm ZmVyWzMwMF07CisJY2hhciAqbG9jYWxlX2ZpbGVuYW1lID0gTlVMTDsKKwlsb2NhbGVfZmlsZW5h bWUgPSBnX2ZpbGVuYW1lX2Zyb21fdXRmOCh3aW5kb3ctPmFyY2hpdmVfZmlsZW5hbWUsIC0xLCBO VUxMLCBOVUxMLCBOVUxMKTsKKwlpZiAobG9jYWxlX2ZpbGVuYW1lID09IE5VTEwpIHsKKwkJZ193 YXJuaW5nKF8oIlNvbWUgY2hhcmFjdGVycyBpbiB0aGUgZmlsZW5hbWUgY291bGQgbm90IGJlIGNv bnZlcnRlZCBmcm9tIFVURi04IHRvIGxvY2FsZSBlbmNvZGluZyIpKTsKKwkJbG9jYWxlX2ZpbGVu YW1lID0gZ19zdHJkdXAod2luZG93LT5hcmNoaXZlX2ZpbGVuYW1lKTsKKwl9CisJZ19zbnByaW50 ZihidWZmZXIsIDMwMCwgIiVzIiwgbG9jYWxlX2ZpbGVuYW1lKTsKKwogCXdpbmRvdy0+YXJjaGl2 ZV9wcmVzZW50ID0gRkFMU0U7CQogCXdpbmRvdy0+Z2l2ZV9mb2N1c190b190aGVfbGlzdCA9IFRS VUU7CiAKIAl3aW5kb3dfY3VycmVudF9hY3Rpb25fZGVzY3JpcHRpb25fc2V0ICh3aW5kb3csIEZS X0JBVENIX0FDVElPTl9PUEVOLCBnX3N0cmR1cCAod2luZG93LT5hcmNoaXZlX2ZpbGVuYW1lKSwg KEdGcmVlRnVuYykgZ19mcmVlKTsKLQlzdWNjZXNzID0gZnJfYXJjaGl2ZV9sb2FkICh3aW5kb3ct PmFyY2hpdmUsIHdpbmRvdy0+YXJjaGl2ZV9maWxlbmFtZSwgd2luZG93LT5wYXNzd29yZCwgJmdl cnJvcik7CisJLy8gc3VjY2VzcyA9IGZyX2FyY2hpdmVfbG9hZCAod2luZG93LT5hcmNoaXZlLCB3 aW5kb3ctPmFyY2hpdmVfZmlsZW5hbWUsIHdpbmRvdy0+cGFzc3dvcmQsICZnZXJyb3IpOworCXN1 Y2Nlc3MgPSBmcl9hcmNoaXZlX2xvYWQgKHdpbmRvdy0+YXJjaGl2ZSwgbG9jYWxlX2ZpbGVuYW1l LCB3aW5kb3ctPnBhc3N3b3JkLCAmZ2Vycm9yKTsKIAl3aW5kb3ctPmFkZF9hZnRlcl9vcGVuaW5n ID0gRkFMU0U7CiAKIAlpZiAoISBzdWNjZXNzKSB7Cg==