[src/netbsd-7]: src/lib/librumphijack Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39873d03348a
branches:  netbsd-7
changeset: 798681:39873d03348a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 09 20:13:38 2014 +0000

description:
Pull up following revision(s) (requested by gson in ticket #303):
        lib/librumphijack/hijack.c: revision 1.110
In case of no dup2'd fd's, make sure that F_CLOSEM for the
rump kernel starts from 0.
Fixes rumphijack fdoff test (notably, this bug had nothing to do with
fdoff, and was exposed >3 years after writing the test when rump kernels
started providing fd's 0/1/2)

diffstat:

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

diffs (27 lines):

diff -r 16ea894a1a01 -r 39873d03348a lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Tue Dec 09 19:39:58 2014 +0000
+++ b/lib/librumphijack/hijack.c        Tue Dec 09 20:13:38 2014 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.109 2014/07/21 14:23:43 gson Exp $       */
+/*      $NetBSD: hijack.c,v 1.109.2.1 2014/12/09 20:13:38 martin Exp $ */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include <rump/rumpuser_port.h>
 
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.109 2014/07/21 14:23:43 gson Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.109.2.1 2014/12/09 20:13:38 martin Exp $");
 #endif
 
 #include <sys/param.h>
@@ -1380,7 +1380,7 @@
                 * for the file descriptors not dup2'd.
                 */
 
-               for (i = 0, maxdup2 = 0; i <= DUP2HIGH; i++) {
+               for (i = 0, maxdup2 = -1; i <= DUP2HIGH; i++) {
                        if (dup2vec[i] & DUP2BIT) {
                                int val;