Changeset 19637 in josm for trunk/native

Timestamp:

2026-10-06T08:57:52+02:00 (4 days ago)

Author:

stoecker

Message:

detect the UTF-8 filename issue in non-UTF contexts, patch by wangi, fix #24940

Location:

trunk/native/linux

Files:

• latest/usr/bin/josm-latest (modified) (1 diff)
• tested/usr/bin/josm (modified) (1 diff)

trunk/native/linux/latest/usr/bin/josm-latest

@@ -58 +58 @@
     # shellcheck source=/etc/default/josm-latest
     . "/etc/default/${JOSM_VERSION}"
+fi
+
+# Java decodes file names with the character set of the locale, and -Dsun.jnu.encoding
+# cannot override it. If the locale is C/POSIX, or cannot be set at all - typically a
+# UTF-8 LANG whose locale is not installed, as in a Flatpak sandbox - file names are
+# decoded as ASCII and opening a folder that holds a non-ASCII name fails with
+# InvalidPathException. Fall back to C.UTF-8 then, which is built into glibc 2.35 and
+# later. This does not change the language of JOSM: when the locale cannot be set, Java
+# already falls back to English. LC_ALL is needed, as setlocale() fails as a whole if
+# any category names a locale that is not installed.
+if { [ -n "$(locale 2>&1 >/dev/null)" ] || [ "$(locale charmap 2>/dev/null)" = "ANSI_X3.4-1968" ]; } \
+        && [ -z "$(LC_ALL=C.UTF-8 locale 2>&1 >/dev/null)" ]; then
+    export LC_ALL=C.UTF-8
 fi
 

trunk/native/linux/tested/usr/bin/josm

@@ -58 +58 @@
     # shellcheck source=/etc/default/josm
     . "/etc/default/${JOSM_VERSION}"
+fi
+
+# Java decodes file names with the character set of the locale, and -Dsun.jnu.encoding
+# cannot override it. If the locale is C/POSIX, or cannot be set at all - typically a
+# UTF-8 LANG whose locale is not installed, as in a Flatpak sandbox - file names are
+# decoded as ASCII and opening a folder that holds a non-ASCII name fails with
+# InvalidPathException. Fall back to C.UTF-8 then, which is built into glibc 2.35 and
+# later. This does not change the language of JOSM: when the locale cannot be set, Java
+# already falls back to English. LC_ALL is needed, as setlocale() fails as a whole if
+# any category names a locale that is not installed.
+if { [ -n "$(locale 2>&1 >/dev/null)" ] || [ "$(locale charmap 2>/dev/null)" = "ANSI_X3.4-1968" ]; } \
+        && [ -z "$(LC_ALL=C.UTF-8 locale 2>&1 >/dev/null)" ]; then
+    export LC_ALL=C.UTF-8
 fi