RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set locale env variables in correct order 

This commit aims to fix the use case of setting multiple environment
variables in locale settings. As described in manpages, consider the
following content of `/etc/locale.conf`:

    LANG=de_DE.UTF-8
    LC_MESSAGES=en_US.UTF-8

The previous behavior caused only `LANG` to be set, leaving the other
variables intact. I am not familiar how exactly shell interprets setting
values on these values, but the value of `LC_MESSAGES` in the example
was never applied to the environment. The only way how to make it
working was to execute `unset LANG` before the `locale.conf` variables
were set.

This code snippet is heavily inspired by
810f9b171f/src/session-child.c
This commit is contained in:
Jakub Krcma 2020-02-28 10:50:27 +01:00
parent eb496b0db5
commit b775f93c22
No known key found for this signature in database
GPG Key ID: A648E7A018179551
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/login.c
View File

@ -207,11 +207,29 @@ void pam_diagnose(int error, struct term_buf* buf)
void env_init(struct passwd* pwd)
{
// borrowed from
// https://github.com/linuxdeepin/lightdm/blob/810f9b171feb779e48eba1dca38eb37d6d027d1a/src/session-child.c
static const char* const locale_var_names[] = {
"LC_PAPER",
"LC_NAME",
"LC_ADDRESS",
"LC_TELEPHONE",
"LC_MEASUREMENT",
"LC_IDENTIFICATION",
"LC_COLLATE",
"LC_CTYPE",
"LC_MONETARY",
"LC_NUMERIC",
"LC_TIME",
"LC_MESSAGES",
"LC_ALL",
"LANG",
NULL
};
extern char** environ;
char* term = getenv("TERM");
char* lang = getenv("LANG");
// clean env
environ[0] = NULL;
environ = NULL;
if (term != NULL)
{
@ -227,7 +245,15 @@ void env_init(struct passwd* pwd)
setenv("SHELL", pwd->pw_shell, 1);
setenv("USER", pwd->pw_name, 1);
setenv("LOGNAME", pwd->pw_name, 1);
setenv("LANG", lang, 1);
char* locale_value;
for (int i = 0; locale_var_names[i] != NULL; i++)
{
if ((locale_value = getenv(locale_var_names[i])) != NULL)
{
setenv(locale_var_names[i], locale_value, 1);
}
}
// Set PATH if specified in the configuration
if (strlen(config.path))