Sun Jan 9 10:28:46 2011 UTC ()

dprintf to stderr.  stop doing it if stderr_fileno gets dup2()'d


(pooka)

diff -r1.4 -r1.5 src/lib/librumphijack/hijack.c

--- src/lib/librumphijack/hijack.c 2011/01/08 21:30:24	1.4
+++ src/lib/librumphijack/hijack.c 2011/01/09 10:28:46	1.5

 @@ -1,14 +1,14 @@
-/*      $NetBSD: hijack.c,v 1.4 2011/01/08 21:30:24 pooka Exp $	*/
+/*      $NetBSD: hijack.c,v 1.5 2011/01/09 10:28:46 pooka Exp $	*/
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.4 2011/01/08 21:30:24 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.5 2011/01/09 10:28:46 pooka Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/poll.h>
 #include <rump/rump.h>
 #include <rump/rumpclient.h>
 #include <rump/rump_syscalls.h>
 #include <assert.h>
 #include <dlfcn.h>
 @@ -149,36 +149,49 @@ rcinit(void)
 		snprintf(sysname, sizeof(sysname), "rump_sys_%s", sysnames[i]);
 		rumpcalls[i] = dlsym(hand, sysname);
 		if (!rumpcalls[i]) {
 			fprintf(stderr, "cannot find symbol: %s\n", sysname);
 			exit(1);
+		}
+	}
 	if (rumpcinit() == -1)
 		err(1, "rumpclient init");
+}
 static unsigned dup2mask;
 #define ISDUP2D(fd) (((fd+1) & dup2mask) == ((fd)+1))
 //#define DEBUGJACK
 #ifdef DEBUGJACK
-#define DPRINTF(x) printf x
+#define DPRINTF(x) mydprintf x
 static void
 mydprintf(const char *fmt, ...)
+{
 	va_list ap;
 	if (ISDUP2D(STDERR_FILENO))
 		return;
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
+}
 #else
 #define DPRINTF(x)
 #endif
 static unsigned dup2mask;
 #define ISDUP2D(fd) (((fd+1) & dup2mask) == ((fd)+1))
 /* XXX: need runtime selection.  low for now due to FD_SETSIZE */
 #define HIJACK_FDOFF 128
 #define HIJACK_SELECT 128 /* XXX */
 #define HIJACK_ASSERT 128 /* XXX */
 static int
 fd_rump2host(int fd)
+{
 	if (fd == -1)
 		return fd;
 	if (!ISDUP2D(fd))
 		fd += HIJACK_FDOFF;