#include "constants.h"
+#include "compiler.h"
#ifdef DEBUG
# include "debug.h"
#endif
-/* Should the "action" handler be invoked for this file descriptor? */
-static int check_handle_fd(int fd) {
- /* Load state from environment. Only necessary once per process. */
- if (!initialized) {
- init_from_environment();
- }
-
- /* tracked_fds_find() is most likely faster than calling isatty(),
- * therefore check if we are tracking this file descriptor first. */
- if (!tracked_fds_find(fd)) {
- return 0;
- }
-
- /* Never touch anything not going to a terminal - unless we are explicitly
- * asked to do so. */
- if (!force_write_to_non_tty && !isatty(fd)) {
- return 0;
- }
+/* See hookmacros.h for the decision if a function call is colored. */
- return 1;
-}
static void dup_fd(int oldfd, int newfd) {
#ifdef DEBUG
debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid());
#endif
- if (!initialized) {
+ if (unlikely(!initialized)) {
init_from_environment();
}
debug("%3d -> .\t\t\t[%d]\n", fd, getpid());
#endif
- if (!initialized) {
+ if (unlikely(!initialized)) {
init_from_environment();
}
/* "Action" handlers called when a file descriptor is matched. */
-static char *pre_string;
+static char const *pre_string;
static size_t pre_string_size;
-static char *post_string;
+static char const *post_string;
static size_t post_string_size;
/* Load alternative pre/post strings from the environment if available, fall
* back to default values. */
-inline static void init_pre_post_string() {
+inline static void init_pre_post_string(void) {
pre_string = getenv(ENV_NAME_PRE_STRING);
if (!pre_string) {
pre_string = DEFAULT_PRE_STRING;
post_string_size = strlen(post_string);
}
-static void handle_fd_pre(int fd, int action) {
- (void)action;
+static void handle_fd_pre(int fd) {
+ int saved_errno = errno;
- if (!pre_string || !post_string) {
+ if (unlikely(!pre_string || !post_string)) {
init_pre_post_string();
}
DLSYM_FUNCTION(real_write, "write");
real_write(fd, pre_string, pre_string_size);
+
+ errno = saved_errno;
}
-static void handle_fd_post(int fd, int action) {
- (void)action;
+static void handle_fd_post(int fd) {
+ int saved_errno = errno;
/* write() already loaded above in handle_fd_pre(). */
real_write(fd, post_string, post_string_size);
+
+ errno = saved_errno;
}
-static void handle_file_pre(FILE *stream, int action) {
- (void)action;
+static void handle_file_pre(FILE *stream) {
+ int saved_errno = errno;
- if (!pre_string || !post_string) {
+ if (unlikely(!pre_string || !post_string)) {
init_pre_post_string();
}
DLSYM_FUNCTION(real_fwrite, "fwrite");
real_fwrite(pre_string, pre_string_size, 1, stream);
+
+ errno = saved_errno;
}
-static void handle_file_post(FILE *stream, int action) {
- (void)action;
+static void handle_file_post(FILE *stream) {
+ int saved_errno = errno;
/* fwrite() already loaded above in handle_file_pre(). */
real_fwrite(post_string, post_string_size, 1, stream);
+
+ errno = saved_errno;
}
int, c, FILE *, stream)
HOOK_FILE1(int, putchar_unlocked, stdout,
int, c)
-HOOK_FILE1(int, puts_unlocked, stdout,
- char const *, s)
/* perror(3) */
HOOK_VOID1(void, perror, STDERR_FILENO,
newfd = real_dup(oldfd);
if (newfd != -1) {
- int saved_errno = errno;
dup_fd(oldfd, newfd);
- errno = saved_errno;
}
return newfd;
newfd = real_dup2(oldfd, newfd);
if (newfd != -1) {
- int saved_errno = errno;
dup_fd(oldfd, newfd);
- errno = saved_errno;
}
return newfd;
newfd = real_dup3(oldfd, newfd, flags);
if (newfd != -1) {
- int saved_errno = errno;
dup_fd(oldfd, newfd);
- errno = saved_errno;
}
return newfd;
/* We only care about duping fds. */
if (cmd == F_DUPFD && result != -1) {
- int saved_errno = errno;
dup_fd(fd, result);
- errno = saved_errno;
}
return result;
/* Count arguments. */ \
size_t count = 1; /* arg */ \
va_start(ap, arg); \
- while (va_arg(ap, const char *)) { \
+ while (va_arg(ap, char const *)) { \
count++; \
} \
va_end(ap); \