Module Name: src
Committed By: christos
Date: Fri Dec 2 20:53:37 UTC 2016
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
fix test lib/librumphijack/t_sh/runscript
(handle F_DUPFD_CLOEXEC that the shell is now using)
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 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.120 src/lib/librumphijack/hijack.c:1.121
--- src/lib/librumphijack/hijack.c:1.120 Thu Aug 11 05:48:57 2016
+++ src/lib/librumphijack/hijack.c Fri Dec 2 15:53:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.120 2016/08/11 09:48:57 kre Exp $ */
+/* $NetBSD: hijack.c,v 1.121 2016/12/02 20:53:36 christos Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
#include <rump/rumpuser_port.h>
#if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.120 2016/08/11 09:48:57 kre Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.121 2016/12/02 20:53:36 christos Exp $");
#endif
#include <sys/param.h>
@@ -987,7 +987,6 @@ fd_rump2host_withdup(int fd)
static int
fd_host2rump(int fd)
{
-
if (!isdup2d(fd))
return fd - hijack_fdoff;
else
@@ -1381,6 +1380,7 @@ fcntl(int fd, int cmd, ...)
DPRINTF(("fcntl -> %d (cmd %d)\n", fd, cmd));
switch (cmd) {
+ case F_DUPFD_CLOEXEC: /* Ignore CLOEXEC bit for now */
case F_DUPFD:
va_start(ap, cmd);
minfd = va_arg(ap, int);
