mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-18 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix non UTF-8 locale complaint

Browse source 
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
This commit is contained in:
Phillip Susi 2023-05-30 15:49:01 -04:00 • committed by Daniel Eklöf
parent 1433a81c08
commit 8859e134ef
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main.c
View file

@ -450,6 +450,7 @@ main(int argc, char *const *argv)
"C.UTF-8", "C.UTF-8",
"en_US.UTF-8", "en_US.UTF-8",
}; };
char *saved_locale = xstrdup(locale);
/* /*
* Try to force an UTF-8 locale. If we succeed, launch the * 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) { if (setlocale(LC_CTYPE, fallback_locale) != NULL) {
LOG_WARN("'%s' is not a UTF-8 locale, using '%s' instead", LOG_WARN("'%s' is not a UTF-8 locale, using '%s' instead",
locale, fallback_locale); saved_locale, fallback_locale);
user_notification_add_fmt( user_notification_add_fmt(
&user_notifications, USER_NOTIFICATION_WARNING, &user_notifications, USER_NOTIFICATION_WARNING,
"'%s' is not a UTF-8 locale, using '%s' instead", "'%s' is not a UTF-8 locale, using '%s' instead",
locale, fallback_locale); saved_locale, fallback_locale);
bad_locale = false; bad_locale = false;
break; break;
@ -476,13 +477,14 @@ main(int argc, char *const *argv)
if (bad_locale) { if (bad_locale) {
LOG_ERR( LOG_ERR(
"'%s' is not a UTF-8 locale, and failed to find a fallback", "'%s' is not a UTF-8 locale, and failed to find a fallback",
locale); saved_locale);
user_notification_add_fmt( user_notification_add_fmt(
&user_notifications, USER_NOTIFICATION_ERROR, &user_notifications, USER_NOTIFICATION_ERROR,
"'%s' is not a UTF-8 locale, and failed to find a fallback", "'%s' is not a UTF-8 locale, and failed to find a fallback",
locale); saved_locale);
} }
free(saved_locale);
} }
struct config conf = {NULL}; struct config conf = {NULL};