improve locale fallback

Author: Samueru-sama

useful-tools/lib/anylinux.c

@@ -37,13 +37,63 @@ typedef int (*execve_func_t)(const char *filename, char *const argv[], char *con
 
 __attribute__((constructor))
 static void locale_fix_init(void) {
-	if (!setlocale(LC_ALL, "")) {
-		LOG("Failed to set locale, falling back to C locale.");
-		if (!setlocale(LC_ALL, "C")) {
-			LOG("Failed to setlocale(LC_ALL, \"C\"): %s", strerror(errno));
-		}
-		if (setenv("LC_ALL", "C", 1) != 0) {
-			LOG("Failed to setenv(LC_ALL, \"C\"): %s", strerror(errno));
+	if (! setlocale(LC_ALL, "")) {
+		LOG("Failed to set locale, falling back to bundled C.UTF-8 locale");
+		// Check if bundled C.UTF-8 locale is available
+		const char *appdir = getenv("APPDIR");
+		if (appdir) {
+			char locale_path[PATH_MAX];
+			snprintf(locale_path, sizeof(locale_path), "%s/lib/locale/C.utf8", appdir);
+
+			if (access(locale_path, F_OK) == 0) {
+				LOG("Found bundled C.UTF-8 locale: %s", locale_path);
+				// Set LOCPATH to the bundled locales directory
+				char locpath[PATH_MAX];
+				snprintf(locpath, sizeof(locpath), "%s/lib/locale", appdir);
+				if (setenv("LOCPATH", locpath, 1) == 0) {
+					LOG("Set LOCPATH to %s", locpath);
+				} else {
+					LOG("Failed to setenv(LOCPATH, \"%s\"): %s", locpath, strerror(errno));
+				}
+
+				// Set LC_ALL to C.UTF-8
+				LOG("Setting LC_ALL to C.UTF-8");
+				if (setenv("LC_ALL", "C.UTF-8", 1) == 0) {
+					if (! setlocale(LC_ALL, "")) {
+						LOG("Failed to set locale with C.UTF-8, falling back to bare C locale.");
+						if (! setlocale(LC_ALL, "C")) {
+							LOG("Failed to setlocale(LC_ALL, \"C\"): %s", strerror(errno));
+						}
+						if (setenv("LC_ALL", "C", 1) != 0) {
+							LOG("Failed to setenv(LC_ALL, \"C\"): %s", strerror(errno));
+						}
+					}
+				} else {
+					LOG("Failed to setenv(LC_ALL, \"C.UTF-8\"): %s", strerror(errno));
+					if (!setlocale(LC_ALL, "C")) {
+						LOG("Failed to setlocale(LC_ALL, \"C\"): %s", strerror(errno));
+					}
+					if (setenv("LC_ALL", "C", 1) != 0) {
+						LOG("Failed to setenv(LC_ALL, \"C\"): %s", strerror(errno));
+					}
+				}
+			} else {
+				LOG("Bundled C.UTF-8 locale not found at %s, falling back to C locale.", locale_path);
+				if (!setlocale(LC_ALL, "C")) {
+					LOG("Failed to setlocale(LC_ALL, \"C\"): %s", strerror(errno));
+				}
+				if (setenv("LC_ALL", "C", 1) != 0) {
+					LOG("Failed to setenv(LC_ALL, \"C\"): %s", strerror(errno));
+				}
+			}
+		} else {
+			LOG("APPDIR not set, cannot check for bundled locales.  Falling back to C locale.");
+			if (!setlocale(LC_ALL, "C")) {
+				LOG("Failed to setlocale(LC_ALL, \"C\"): %s", strerror(errno));
+			}
+			if (setenv("LC_ALL", "C", 1) != 0) {
+				LOG("Failed to setenv(LC_ALL, \"C\"): %s", strerror(errno));
+			}
 		}
 	}
 }