diff options
Diffstat (limited to 'glusterfsd/src')
| -rw-r--r-- | glusterfsd/src/Makefile.am | 6 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am index 060917930de..38151fd5cfd 100644 --- a/glusterfsd/src/Makefile.am +++ b/glusterfsd/src/Makefile.am @@ -1,6 +1,9 @@ sbin_PROGRAMS = glusterfsd glusterfsd_SOURCES = glusterfsd.c fetch-spec.c +if GF_DARWIN_HOST_OS +glusterfsd_SOURCES += $(CONTRIBDIR)/apple/daemon.c +endif glusterfsd_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD) glusterfsd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) noinst_HEADERS = glusterfsd.h @@ -8,6 +11,9 @@ noinst_HEADERS = glusterfsd.h AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ -I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS) +if GF_DARWIN_HOST_OS +AM_CFLAGS += -I$(CONTRIBDIR)/apple +endif CLEANFILES = diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index afd9cafa655..8ffa3ac461b 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -73,6 +73,13 @@ #include <fnmatch.h> +#ifdef GF_DARWIN_HOST_OS +#include "daemon.h" +#else +#define os_daemon(u, v) daemon (u, v) +#endif + + /* using argp for command line parsing */ static char gf_doc[] = ""; static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n" \ @@ -207,7 +214,7 @@ gf_daemon (int *pipe_fd) /*child continues*/ close (pipe_fd[0]); - if (daemon (0, 0) == -1) { + if (os_daemon (0, 0) == -1) { gf_log ("glusterfs", GF_LOG_ERROR, "unable to run in daemon mode: %s", strerror (errno)); @@ -1063,7 +1070,12 @@ zr_build_process_uuid () localtime_r (&tv.tv_sec, &now); strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now); - snprintf (tmp_str, 1024, "%s-%d-%s:%ld", + snprintf (tmp_str, 1024, "%s-%d-%s:%" +#ifdef GF_DARWIN_HOST_OS + PRId32, +#else + "ld", +#endif hostname, getpid(), now_str, tv.tv_usec); return gf_strdup (tmp_str); |