aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Susi <phill@thesusis.net>2023-05-30 19:49:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-01 10:12:49 +0000
commit8859e134efa422d50e53c0bbb0e83d07ddf66091 (patch)
tree72dbe80c5504ed7c003b9e8a3a0eae4b6f91631f
parentsixel: apply background alpha when P2=0 or P2=2, and current bg color is the default bg color (diff)
Fix non UTF-8 locale complaint
If the locale isn't UTF-8, foot tries to fall back to C.UTF-8 and prints a warning. The warning was garbled because the name of the original locale is no longer valid after calling setlocale() a second time. Use strdup to stash the original string. Closes #1362
-rw-r--r--main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.c b/main.c
index 3f9846f3..f58e170f 100644
--- a/main.c
+++ b/main.c
@@ -450,6 +450,7 @@ main(int argc, char *const *argv)
"C.UTF-8",
"en_US.UTF-8",
};
+ char *saved_locale = xstrdup(locale);
/*
* Try to force an UTF-8 locale. If we succeed, launch the
@@ -461,12 +462,12 @@ main(int argc, char *const *argv)
if (setlocale(LC_CTYPE, fallback_locale) != NULL) {
LOG_WARN("'%s' is not a UTF-8 locale, using '%s' instead",
- locale, fallback_locale);
+ saved_locale, fallback_locale);
user_notification_add_fmt(
&user_notifications, USER_NOTIFICATION_WARNING,
"'%s' is not a UTF-8 locale, using '%s' instead",
- locale, fallback_locale);
+ saved_locale, fallback_locale);
bad_locale = false;
break;
@@ -476,13 +477,14 @@ main(int argc, char *const *argv)
if (bad_locale) {
LOG_ERR(
"'%s' is not a UTF-8 locale, and failed to find a fallback",
- locale);
+ saved_locale);
user_notification_add_fmt(
&user_notifications, USER_NOTIFICATION_ERROR,
"'%s' is not a UTF-8 locale, and failed to find a fallback",
- locale);
+ saved_locale);
}
+ free(saved_locale);
}
struct config conf = {NULL};