int, c, FILE *, stream)
HOOK_FILE2(int, putc, stream,
int, c, FILE *, stream)
+/* The glibc uses a macro for putc() which expands to _IO_putc(). However
+ * sometimes the raw putc() is used as well, not sure why. Make sure to hook
+ * it too. */
+#ifdef putc
+# undef putc
+HOOK_FILE2(int, putc, stream,
+ int, c, FILE *, stream)
+#endif
HOOK_FILE1(int, putchar, stdout,
int, c)
HOOK_FILE1(int, puts, stdout,
DLSYM_FUNCTION(real_dup, "dup");
newfd = real_dup(oldfd);
- if (newfd != -1) {
+ if (newfd > -1) {
dup_fd(oldfd, newfd);
}
DLSYM_FUNCTION(real_dup2, "dup2");
newfd = real_dup2(oldfd, newfd);
- if (newfd != -1) {
+ if (newfd > -1) {
dup_fd(oldfd, newfd);
}
DLSYM_FUNCTION(real_dup3, "dup3");
newfd = real_dup3(oldfd, newfd, flags);
- if (newfd != -1) {
+ if (newfd > -1) {
dup_fd(oldfd, newfd);
}
va_end(ap);
/* We only care about duping fds. */
- if (cmd == F_DUPFD && result != -1) {
+ if (cmd == F_DUPFD && result > -1) {
dup_fd(fd, result);
}
#ifdef HAVE_EXECVPE
extern char **environ;
int execvpe(char const *file, char * const argv[], char * const envp[]) {
+ int result;
+ char **old_environ = environ;
+
/* Fake the environment so we can reuse execvp(). */
environ = (char **)envp;
/* execvp() updates the environment. */
- return execvp(file, argv);
+ result = execvp(file, argv);
+
+ environ = old_environ;
+ return result;
}
#endif