Module Name: src
Committed By: pooka
Date: Mon Feb 21 20:11:57 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
If minfd for F_DUPFD is >= hijackoff, assume it means a minimum
value in the rump kernel and adjust accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.62 src/lib/librumphijack/hijack.c:1.63
--- src/lib/librumphijack/hijack.c:1.62 Mon Feb 21 13:19:35 2011
+++ src/lib/librumphijack/hijack.c Mon Feb 21 20:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.62 2011/02/21 13:19:35 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.63 2011/02/21 20:11:56 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.62 2011/02/21 13:19:35 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.63 2011/02/21 20:11:56 pooka Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -604,6 +604,8 @@
if (fd_isrump(oldd)) {
op_fcntl = GETSYSCALL(rump, FCNTL);
oldd = fd_host2rump(oldd);
+ if (minfd >= HIJACK_FDOFF)
+ minfd -= HIJACK_FDOFF;
isrump = 1;
} else {
op_fcntl = GETSYSCALL(host, FCNTL);
