Update XDG_RUNTIME_DIR directory

This commit is contained in:
Dan Walsh 2014-05-12 13:19:19 -04:00 committed by Stephen Smalley
parent 241fac2728
commit 6ee0299ab7

View File

@ -964,6 +964,7 @@ int main(int argc, char **argv) {
if (child == 0) {
char *display = NULL;
char *LANG = NULL;
char *RUNTIME_DIR = NULL;
int rc = -1;
char *resolved_path = NULL;
@ -1014,6 +1015,13 @@ int main(int argc, char **argv) {
}
}
if ((RUNTIME_DIR = getenv("XDG_RUNTIME_DIR")) != NULL) {
if ((RUNTIME_DIR = strdup(RUNTIME_DIR)) == NULL) {
perror(_("Out of memory"));
goto childerr;
}
}
if ((rc = clearenv()) != 0) {
perror(_("Failed to clear environment"));
goto childerr;
@ -1022,6 +1030,8 @@ int main(int argc, char **argv) {
rc |= setenv("DISPLAY", display, 1);
if (LANG)
rc |= setenv("LANG", LANG, 1);
if (RUNTIME_DIR)
rc |= setenv("XDG_RUNTIME_DIR", RUNTIME_DIR, 1);
rc |= setenv("HOME", pwd->pw_dir, 1);
rc |= setenv("SHELL", pwd->pw_shell, 1);
rc |= setenv("USER", pwd->pw_name, 1);
@ -1049,6 +1059,7 @@ childerr:
free(resolved_path);
free(display);
free(LANG);
free(RUNTIME_DIR);
exit(-1);
}