sheppy/colorredstderr-mirror
1
0
Fork 0
mirror of https://github.com/FAUSheppy/colorredstderr-mirror synced 2025-12-12 18:08:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Overwrite tracked file descriptors when exporting COLORED_STDERR_FDS.

Browse Source 
If the list of tracked file descriptors is modified to contain unwanted
values (e.g. when a parent process closes or redirects stderr), this
makes it possible to set the tracked file descriptors back to a given
list.

This problem occurred with startx which somehow closes or redirects
stderr. As COLORED_STDERR_FDS was set in the shell running startx, this
disabled coloring stderr for all processes started in the X11 session.

This is no longer an issue. As COLORED_STDERR_FDS is set in the shell
configuration file, it automatically sets the list to the correct value
when a shell is opened in the terminal emulator once X11 is running.
This commit is contained in:
Simon Ruderich
2013-06-21 18:26:23 +02:00
parent 045ca46e79
commit 0d7f306898
8 changed files with 160 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/trackfds.h
View File

@@ -72,8 +72,9 @@ static int init_tracked_fds_list(size_t count) {
/* Load tracked file descriptors from the environment. The environment is used
* to pass the information to child processes.
*
* ENV_NAME_FDS has the following format: Each descriptor as string followed
* by a comma; there's a trailing comma. Example: "2,4,". */
* ENV_NAME_FDS and ENV_NAME_PRIVATE_FDS have the following format: Each
* descriptor as string followed by a comma; there's a trailing comma.
* Example: "2,4,". */
static void init_from_environment(void) {
#ifdef DEBUG
debug("init_from_environment()\t\t[%d]\n", getpid());
@@ -92,14 +93,23 @@ static void init_from_environment(void) {
force_write_to_non_tty = 1;
}
/* Prefer user defined list of file descriptors, fall back to file
* descriptors passed through the environment from the parent process. */
env = getenv(ENV_NAME_FDS);
if (env) {
used_fds_set_by_user = 1;
} else {
env = getenv(ENV_NAME_PRIVATE_FDS);
}
if (!env) {
errno = saved_errno;
return;
}
#ifdef DEBUG
debug(" getenv(\"%s\"): \"%s\"\n", ENV_NAME_FDS, env);
debug(" getenv(\"%s\"): \"%s\"\n", ENV_NAME_PRIVATE_FDS, env);
#endif
/* Environment must be treated read-only. */
char env_copy[strlen(env) + 1];
strcpy(env_copy, env);
@@ -225,16 +235,29 @@ static void update_environment(void) {
return;
}
int saved_errno = errno;
char env[update_environment_buffer_size()];
env[0] = 0;
update_environment_buffer(env);
#if 0
debug(" setenv(\"%s\", \"%s\", 1)\n", ENV_NAME_FDS, env);
debug(" setenv(\"%s\", \"%s\", 1)\n", ENV_NAME_PRIVATE_FDS, env);
#endif
setenv(ENV_NAME_PRIVATE_FDS, env, 1 /* overwrite */);
setenv(ENV_NAME_FDS, env, 1 /* overwrite */);
/* Child processes must use ENV_NAME_PRIVATE_FDS to get the updated list
* of tracked file descriptors, not the static list provided by the user
* in ENV_NAME_FDS.
*
* But only remove it if the static list in ENV_NAME_FDS was loaded by
* init_from_environment() and merged into ENV_NAME_PRIVATE_FDS. */
if (used_fds_set_by_user) {
unsetenv(ENV_NAME_FDS);
}
errno = saved_errno;
}