Module Name: src
Committed By: pooka
Date: Sun Jan 9 10:28:46 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
dprintf to stderr. stop doing it if stderr_fileno gets dup2()'d
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/lib/librumphijack/hijack.c:1.5
--- src/lib/librumphijack/hijack.c:1.4 Sat Jan 8 21:30:24 2011
+++ src/lib/librumphijack/hijack.c Sun Jan 9 10:28:46 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -26,7 +26,7 @@
*/
#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>
@@ -159,16 +159,29 @@
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 */
