X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=d4ffdb6aa5bcb84cc3d9450e5ea8052b534a06cd;hb=9434382c9ee992da3c21ff830793f15a55fc2b2d;hp=f005c726446a35231dd6a4ebacce7367e461a27b;hpb=428e15bf687a05783c1fbbcb034b2c3eddb9fab5;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index f005c72..d4ffdb6 100644
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -20,6 +20,8 @@
 
 #include <config.h>
 
+#include "compiler.h"
+
 /* Must be loaded before the following headers. */
 #include "ldpreload.h"
 
@@ -51,8 +53,7 @@ static int force_write_to_non_tty;
 
 
 #include "constants.h"
-#include "compiler.h"
-#ifdef DEBUG
+#ifdef WARNING
 # include "debug.h"
 #endif
 
@@ -67,7 +68,7 @@ static int force_write_to_non_tty;
 /* Prevent inlining into hook functions because it may increase the number of
  * spilled registers unnecessarily. As it's not called very often accept the
  * additional call. */
-static int isatty_noinline(int fd) __noinline;
+static int isatty_noinline(int fd) noinline;
 static int isatty_noinline(int fd) {
     int saved_errno = errno;
     int result = isatty(fd);
@@ -137,10 +138,10 @@ static void init_pre_post_string(void) {
 
 /* Don't inline any of the pre/post functions. Keep the hook function as small
  * as possible for speed reasons. */
-static void handle_fd_pre(int fd) __noinline;
-static void handle_fd_post(int fd) __noinline;
-static void handle_file_pre(FILE *stream) __noinline;
-static void handle_file_post(FILE *stream) __noinline;
+static void handle_fd_pre(int fd) noinline;
+static void handle_fd_post(int fd) noinline;
+static void handle_file_pre(FILE *stream) noinline;
+static void handle_file_post(FILE *stream) noinline;
 
 static void handle_fd_pre(int fd) {
     int saved_errno = errno;
@@ -242,9 +243,9 @@ HOOK_VOID1(void, perror, STDERR_FILENO,
 
 /* error(3) */
 #ifdef HAVE_ERROR_H
-static void  error_vararg(int status, int errnum,
-                   char const *filename, unsigned int linenum,
-                   char const *format, va_list ap) {
+static void error_vararg(int status, int errnum,
+                         char const *filename, unsigned int linenum,
+                         char const *format, va_list ap) {
     static char const *last_filename;
     static unsigned int last_linenum;
 
@@ -529,9 +530,19 @@ int execv(char const *path, char * const argv[]) {
 }
 
 static int (*real_execvp)(char const *path, char * const argv[]);
-int execvp(char const *path, char * const argv[]) {
+int execvp(char const *file, char * const argv[]) {
     DLSYM_FUNCTION(real_execvp, "execvp");
 
     update_environment();
-    return real_execvp(path, argv);
+    return real_execvp(file, argv);
 }
+
+#ifdef HAVE_EXECVPE
+extern char **environ;
+int execvpe(char const *file, char * const argv[], char * const envp[]) {
+    /* Fake the environment so we can reuse execvp(). */
+    environ = (char **)envp;
+
+    return execvp(file, argv);
+}
+#endif