aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-08-10 14:38:35 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-08-13 15:33:23 +0000
commit6d351ffc43175b59359258eca83e652d76cfc426 (patch)
tree1beaba9b2288e0b53f8edf1d70a97491818ee36c
parentslave: prefix user notifications with 'foot' (diff)
main: invalid locale != non-UTF-8 locale
When doing locale fallback, and printing user notifications and log warnings, better separate the case "locale is invalid" from "locale is valid but not UTF-8". Closes #1798
-rw-r--r--main.c53
1 files changed, 35 insertions, 18 deletions
diff --git a/main.c b/main.c
index f46d712e..b2266d88 100644
--- a/main.c
+++ b/main.c
@@ -425,19 +425,18 @@ main(int argc, char *const *argv)
* that does not exist on this system, then the above call may return
* NULL. We should just continue with the fallback method below.
*/
- LOG_WARN("setlocale() failed");
- locale = "C";
+ LOG_ERR("setlocale() failed");
}
- LOG_INFO("locale: %s", locale);
+ LOG_INFO("locale: %s", locale != NULL ? locale : "<invalid>");
- bool bad_locale = !locale_is_utf8();
+ bool bad_locale = locale == NULL || !locale_is_utf8();
if (bad_locale) {
static const char fallback_locales[][12] = {
"C.UTF-8",
"en_US.UTF-8",
};
- char *saved_locale = xstrdup(locale);
+ char *saved_locale = locale != NULL ? xstrdup(locale) : NULL;
/*
* Try to force an UTF-8 locale. If we succeed, launch the
@@ -448,13 +447,23 @@ main(int argc, char *const *argv)
const char *const fallback_locale = fallback_locales[i];
if (setlocale(LC_CTYPE, fallback_locale) != NULL) {
- LOG_WARN("'%s' is not a UTF-8 locale, using '%s' instead",
- saved_locale, fallback_locale);
+ if (saved_locale != NULL) {
+ LOG_WARN(
+ "'%s' is not a UTF-8 locale, falling back to '%s'",
+ saved_locale, fallback_locale);
- user_notification_add_fmt(
- &user_notifications, USER_NOTIFICATION_WARNING,
- "'%s' is not a UTF-8 locale, using '%s' instead",
- saved_locale, fallback_locale);
+ user_notification_add_fmt(
+ &user_notifications, USER_NOTIFICATION_WARNING,
+ "'%s' is not a UTF-8 locale, falling back to '%s'",
+ saved_locale, fallback_locale);
+
+ } else {
+ LOG_WARN(
+ "invalid locale, falling back to '%s'", fallback_locale);
+ user_notification_add_fmt(
+ &user_notifications, USER_NOTIFICATION_WARNING,
+ "invalid locale, falling back to '%s'", fallback_locale);
+ }
bad_locale = false;
break;
@@ -462,14 +471,22 @@ main(int argc, char *const *argv)
}
if (bad_locale) {
- LOG_ERR(
- "'%s' is not a UTF-8 locale, and failed to find a fallback",
- saved_locale);
+ if (saved_locale != NULL) {
+ LOG_ERR(
+ "'%s' is not a UTF-8 locale, and failed to find a fallback",
+ saved_locale);
+
+ user_notification_add_fmt(
+ &user_notifications, USER_NOTIFICATION_ERROR,
+ "'%s' is not a UTF-8 locale, and failed to find a fallback",
+ saved_locale);
+ } else {
+ LOG_ERR("invalid locale, and failed to find a fallback");
- user_notification_add_fmt(
- &user_notifications, USER_NOTIFICATION_ERROR,
- "'%s' is not a UTF-8 locale, and failed to find a fallback",
- saved_locale);
+ user_notification_add_fmt(
+ &user_notifications, USER_NOTIFICATION_ERROR,
+ "invalid locale, and failed to find a fallback");
+ }
}
free(saved_locale);
}