r3983 - in trunk/varnish-cache: bin/varnishd bin/varnishlog bin/varnishncsa include lib/libvarnish

[sky at projects.linpro.no]

Author: sky
Date: 2009-03-23 12:28:56 +0100 (Mon, 23 Mar 2009)
New Revision: 3983

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
   trunk/varnish-cache/bin/varnishlog/varnishlog.c
   trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Apple has deprecated an old function in 10.5, go use launchd instead

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2009-03-23 09:57:24 UTC (rev 3982)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2009-03-23 11:28:56 UTC (rev 3983)
@@ -627,7 +627,7 @@
 	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());
 

Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c	2009-03-23 09:57:24 UTC (rev 3982)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c	2009-03-23 11:28:56 UTC (rev 3983)
@@ -372,7 +372,7 @@
 		exit(1);
 	}
 
-	if (D_flag && daemon(0, 0) == -1) {
+	if (D_flag && inxorcise(0, 0) == -1) {
 		perror("daemon()");
 		if (pfh != NULL)
 			vpf_remove(pfh);

Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2009-03-23 09:57:24 UTC (rev 3982)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2009-03-23 11:28:56 UTC (rev 3983)
@@ -569,7 +569,7 @@
 		exit(1);
 	}
 
-	if (D_flag && daemon(0, 0) == -1) {
+	if (D_flag && inxorcise(0, 0) == -1) {
 		perror("daemon()");
 		if (pfh != NULL)
 			vpf_remove(pfh);

Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2009-03-23 09:57:24 UTC (rev 3982)
+++ trunk/varnish-cache/include/libvarnish.h	2009-03-23 11:28:56 UTC (rev 3983)
@@ -126,3 +126,5 @@
 	lbv_assert(__func__, __FILE__, __LINE__, expl, errno, 3);	\
 	abort();							\
 } while (0)
+
+int inxorcise(int nochdir, int noclose);

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-03-23 09:57:24 UTC (rev 3982)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-03-23 11:28:56 UTC (rev 3983)
@@ -14,6 +14,7 @@
 	cli.c \
 	cli_common.c \
 	flopen.c \
+	inxorcise.c \
 	num.c \
 	time.c \
 	tcp.c \