2 files changed, 18 insertions, 2 deletions
diff --git a/src/unistd/fchdir.c b/src/unistd/fchdir.c
index e5595f77..9fbc8154 100644
--- a/src/unistd/fchdir.c
+++ b/src/unistd/fchdir.c
@@ -1,7 +1,15 @@
 #include <unistd.h>
+#include <errno.h>
 #include "syscall.h"
 
+void __procfdname(char *, unsigned);
+
 int fchdir(int fd)
 {
-	return syscall(SYS_fchdir, fd);
+	int ret = __syscall(SYS_fchdir, fd);
+	if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+	char buf[15+3*sizeof(int)];
+	__procfdname(buf, fd);
+	return syscall(SYS_chdir, buf);
 }
diff --git a/src/unistd/fchown.c b/src/unistd/fchown.c
index b05f0be4..e1c3198a 100644
--- a/src/unistd/fchown.c
+++ b/src/unistd/fchown.c
@@ -1,7 +1,15 @@
 #include <unistd.h>
+#include <errno.h>
 #include "syscall.h"
 
+void __procfdname(char *, unsigned);
+
 int fchown(int fd, uid_t uid, gid_t gid)
 {
-	return syscall(SYS_fchown, fd, uid, gid);
+	int ret = __syscall(SYS_fchown, fd, uid, gid);
+	if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+	char buf[15+3*sizeof(int)];
+	__procfdname(buf, fd);
+	return syscall(SYS_chown, buf, uid, gid);
 }