X-Git-Url: https://ruderich.org/simon/gitweb/?p=coloredstderr%2Fcoloredstderr.git;a=blobdiff_plain;f=src%2Ftrackfds.h;h=9b2aaa6701c854f6c3c7ae3c570b4984ebf1b289;hp=8237781580d4e32266d11dccce3c7139c4866e97;hb=dfd317650f05542db49d7bc37649a232f28efa3f;hpb=fe3f7d4c635b265c58efd5bc420d32135ec7903e diff --git a/src/trackfds.h b/src/trackfds.h index 8237781..9b2aaa6 100644 --- a/src/trackfds.h +++ b/src/trackfds.h @@ -78,6 +78,8 @@ static void init_from_environment(void) { #endif char const *env; + int saved_errno = errno; + initialized = 1; tracked_fds_list_count = 0; @@ -90,6 +92,7 @@ static void init_from_environment(void) { env = getenv(ENV_NAME_FDS); if (!env) { + errno = saved_errno; return; } /* Environment is read-only. */ @@ -153,6 +156,8 @@ next: #ifdef DEBUG tracked_fds_debug(); #endif + + errno = saved_errno; } static char *update_environment_buffer_entry(char *x, int fd) { @@ -231,6 +236,8 @@ static void tracked_fds_add(int fd) { } if (tracked_fds_list_count >= tracked_fds_list_space) { + int saved_errno = errno; + size_t new_space = tracked_fds_list_space + TRACKFDS_REALLOC_STEP; int *tmp = realloc(tracked_fds_list, sizeof(*tracked_fds_list) * new_space); @@ -242,8 +249,11 @@ static void tracked_fds_add(int fd) { warning("realloc(tracked_fds_list, %zu) failed! [%d]\n", sizeof(*tracked_fds_list) * new_space, getpid()); #endif + errno = saved_errno; return; } + errno = saved_errno; + tracked_fds_list = tmp; tracked_fds_list_space = new_space; }