r4098 - in trunk/varnish-cache: . bin/varnishd bin/varnishlog bin/varnishncsa include lib/libvarnish
des at projects.linpro.no
des at projects.linpro.no
Sat Jun 6 20:43:28 CEST 2009
Author: des
Date: 2009-06-06 20:43:28 +0200 (Sat, 06 Jun 2009)
New Revision: 4098
Removed:
trunk/varnish-cache/lib/libvarnish/inxorcise.c
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/configure.ac
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
We already had a perfectly good daemon(3) implementation in the tree. All
we had to do was add a configure check for Mac OS X.
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2009-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2009-06-06 18:43:28 UTC (rev 4098)
@@ -716,7 +716,7 @@
if (d_flag == 1)
DebugStunt();
if (d_flag < 2 && !F_flag)
- AZ(inxorcise(1, d_flag));
+ AZ(daemon(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-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c 2009-06-06 18:43:28 UTC (rev 4098)
@@ -373,7 +373,7 @@
exit(1);
}
- if (D_flag && inxorcise(0, 0) == -1) {
+ if (D_flag && daemon(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-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2009-06-06 18:43:28 UTC (rev 4098)
@@ -570,7 +570,7 @@
exit(1);
}
- if (D_flag && inxorcise(0, 0) == -1) {
+ if (D_flag && daemon(0, 0) == -1) {
perror("daemon()");
if (pfh != NULL)
vpf_remove(pfh);
Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2009-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/configure.ac 2009-06-06 18:43:28 UTC (rev 4098)
@@ -178,6 +178,19 @@
AC_CHECK_FUNCS([strlcat strlcpy])
AC_CHECK_FUNCS([strndup])
AC_CHECK_FUNCS([daemon])
+# white lie - we don't actually test it
+AC_MSG_CHECKING([whether daemon() works])
+case $target in
+*-*-darwin*)
+ # present but not functional
+ AC_MSG_RESULT([no])
+ ac_cv_func_daemon=no
+ ;;
+*)
+ AC_MSG_RESULT([yes])
+ ;;
+esac
+
AC_SYS_LARGEFILE
save_LIBS="${LIBS}"
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2009-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/include/libvarnish.h 2009-06-06 18:43:28 UTC (rev 4098)
@@ -127,6 +127,4 @@
lbv_assert(__func__, __FILE__, __LINE__, expl, errno, 3); \
abort(); \
} while (0)
-
-int inxorcise(int nochdir, int noclose);
const char* svn_version(void);
Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2009-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2009-06-06 18:43:28 UTC (rev 4098)
@@ -14,7 +14,6 @@
cli.c \
cli_common.c \
flopen.c \
- inxorcise.c \
num.c \
time.c \
tcp.c \
Deleted: trunk/varnish-cache/lib/libvarnish/inxorcise.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/inxorcise.c 2009-06-06 18:42:43 UTC (rev 4097)
+++ trunk/varnish-cache/lib/libvarnish/inxorcise.c 2009-06-06 18:43:28 UTC (rev 4098)
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2009 Linpro AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at 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.
- *
- * 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 "svnid.h"
-SVNID("$Id$")
-
-#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
More information about the varnish-commit
mailing list