#ifdef HAVE_ERROR_H
# include <error.h>
#endif
+#ifdef HAVE_STRUCT__IO_FILE__FILENO
+# include <libio.h>
+#endif
/* 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(). */
int, c, FILE *, stream)
HOOK_FILE1(int, putchar_unlocked, stdout,
int, c)
+/* glibc defines (_IO_)putc_unlocked() to __overflow() in some cases. */
+#ifdef HAVE_STRUCT__IO_FILE__FILENO
+HOOK_FD2(int, __overflow, f->_fileno, _IO_FILE *, f, int, ch)
+#endif
/* perror(3) */
HOOK_VOID1(void, perror, STDERR_FILENO,
int close(int fd) {
DLSYM_FUNCTION(real_close, "close");
- close_fd(fd);
+ if (fd >= 0) {
+ close_fd(fd);
+ }
return real_close(fd);
}
static int (*real_fclose)(FILE *);
int fclose(FILE *fp) {
+ int fd;
+
DLSYM_FUNCTION(real_fclose, "fclose");
- close_fd(fileno(fp));
+ if (fp != NULL && (fd = fileno(fp)) >= 0) {
+ close_fd(fd);
+ }
return real_fclose(fp);
}
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