Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumphijack fix test lib/librumphijack/t_sh/runscript



details:   https://anonhg.NetBSD.org/src/rev/18be5f59248e
branches:  trunk
changeset: 349263:18be5f59248e
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 02 20:53:36 2016 +0000

description:
fix test lib/librumphijack/t_sh/runscript
(handle F_DUPFD_CLOEXEC that the shell is now using)

diffstat:

 lib/librumphijack/hijack.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 75aad31a07e6 -r 18be5f59248e lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Fri Dec 02 19:25:19 2016 +0000
+++ b/lib/librumphijack/hijack.c        Fri Dec 02 20:53:36 2016 +0000
@@ -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 @@
 static int
 fd_host2rump(int fd)
 {
-
        if (!isdup2d(fd))
                return fd - hijack_fdoff;
        else
@@ -1381,6 +1380,7 @@
        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);



Home | Main Index | Thread Index | Old Index