X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=cc588836817b4dfaad26713b7a3b24f77c145cff;hb=8a58e07a5bc69ef7170faee373d070684d2f159d;hp=e3cc1d6337bd8839b68df218494ee6de1862acbb;hpb=55e8d0d38a256496f9eca9d7f293e1d2e8692a2c;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/coloredstderr.c b/src/coloredstderr.c index e3cc1d6..cc58883 100644 --- a/src/coloredstderr.c +++ b/src/coloredstderr.c @@ -38,6 +38,11 @@ /* Conflicting declaration in glibc. */ #undef fwrite_unlocked +/* These functions may be macros when compiling with hardening flags (fortify) + * which cause build failures when used in our hook macros below. Observed + * with Clang on Debian Wheezy. */ +#undef printf +#undef fprintf /* Used by various functions, including debug(). */ @@ -536,3 +541,13 @@ int execvp(char const *file, char * const argv[]) { update_environment(); 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