Merge r3983-r3987: Apple has deprecated an old function in 10.5, go use launchd instead

git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@4003 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/varnishd.c

@@ -645,7 +645,7 @@ main(int argc, char * const *argv)
 	if (d_flag == 1)
 		DebugStunt();
 	if (d_flag < 2 && !F_flag)
-		AZ(daemon(1, d_flag));
+		AZ(inxorcise(1, d_flag));
 	if (d_flag == 1)
 		printf("%d\n", getpid());
 

bin/varnishlog/varnishlog.c

@@ -372,7 +372,7 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (D_flag && daemon(0, 0) == -1) {
+	if (D_flag && inxorcise(0, 0) == -1) {
 		perror("daemon()");
 		if (pfh != NULL)
 			vpf_remove(pfh);

bin/varnishncsa/varnishncsa.c

@@ -569,7 +569,7 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (D_flag && daemon(0, 0) == -1) {
+	if (D_flag && inxorcise(0, 0) == -1) {
 		perror("daemon()");
 		if (pfh != NULL)
 			vpf_remove(pfh);

include/libvarnish.h

@@ -130,3 +130,5 @@ do {									\
 	lbv_assert(__func__, __FILE__, __LINE__, expl, errno, 3);	\
 	abort();							\
 } while (0)
+
+int inxorcise(int nochdir, int noclose);

lib/libvarnish/Makefile.am

@@ -15,6 +15,7 @@ libvarnish_la_SOURCES = \
 	cli_common.c \
 	crc32.c \
 	flopen.c \
+	inxorcise.c \
 	num.c \
 	time.c \
 	tcp.c \

lib/libvarnish/inxorcise.c

+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2008 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS 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 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.
+ *
+ * $Id$
+ *
+ * This file only exists because Apple has decided to break a
+ * function that has an age old tradition and force the user
+ * to use launchd instead.
+ *
+ *
+ */
+ 
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "libvarnish.h"
+
+#if __APPLE__ && __MAC_OS_X_VERSION_10_5
+int inxorcise(int nochdir __attribute__((unused)), int noclose __attribute__((unused))) {
+	fprintf(stderr, "Apple does not want programs to use daemon(3) and suggests using launchd(1).  We don't agree, but their dad is bigger than our dad.\n");
+	exit(1);
+}
+#else
+int inxorcise(int nochdir, int noclose) {
+	return daemon(nochdir, noclose);
+}
+#endif