Module: check_mk
Branch: master
Commit: f6ac0442018758a2fc79676bf784f333cc3d4a49
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6ac0442018758…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Nov 11 13:41:35 2011 +0100
livecheck: install, compile without diet
---
livestatus/src/Makefile.am | 7 ++++++-
livestatus/src/livecheck.c | 13 ++++++++-----
livestatus/src/strutil.cc | 2 +-
scripts/setup.sh | 2 +-
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index 6ee10cf..d44d961 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -52,7 +52,12 @@ livestatus_so_SOURCES = \
ContactgroupsColumn.cc opids.cc auth.cc livechecking.c
livecheck: livecheck.c strutil.cc
- diet gcc -I.. -s -o $@ $^
+ @if type diet >/dev/null 2>&1 ; then \
+ echo "You have no dietlibc install. We won't be able to create a static
binary." ; \
+ diet $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \
+ else \
+ $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \
+ fi
livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC
livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS)
diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c
index 9d79dfd..40ad282 100644
--- a/livestatus/src/livecheck.c
+++ b/livestatus/src/livecheck.c
@@ -28,6 +28,8 @@
#include <sys/timeb.h>
#include <stdlib.h>
#include <fcntl.h>
+#include <string.h>
+
#include "strutil.h"
int main(int argc, char **argv)
@@ -42,12 +44,13 @@ int main(int argc, char **argv)
while (1) {
write(1, "*", 1); // Signal Nagios that we are finished
- if (NULL == fgets(host, sizeof(host), stdin)) {
+ if (NULL == fgets(host, sizeof(host), stdin)
+ || NULL == fgets(service, sizeof(service), stdin)
+ || NULL == fgets(latency, sizeof(latency), stdin)
+ || NULL == fgets(command, sizeof(command), stdin))
+ {
exit(0);
}
- fgets(service, sizeof(service), stdin);
- fgets(latency, sizeof(latency), stdin);
- fgets(command, sizeof(command), stdin);
int fd[2];
pipe(fd);
@@ -113,7 +116,7 @@ int main(int argc, char **argv)
ftime(&end);
char template[256];
snprintf(template, sizeof(template), "%s/cXXXXXX",
check_result_path);
- mktemp(template);
+ char *foo = mktemp(template);
FILE *checkfile = fopen(template, "w");
fprintf(checkfile, "host_name=%s", host);
if (service[0] != '\n')
diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc
index feceb37..24cada2 100644
--- a/livestatus/src/strutil.cc
+++ b/livestatus/src/strutil.cc
@@ -93,7 +93,7 @@ char *save_next_token(char **c, char delim)
{
char *result = next_token(c, delim);
if (result == 0)
- return "";
+ return (char *)"";
else
return result;
}
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 6e9215a..52ee58d 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -556,7 +556,7 @@ EOF
make -j 8 2>&1 &&
strip src/livestatus.o &&
mkdir -p $DESTDIR$libdir &&
- install -m 755 src/livestatus.o $DESTDIR$libdir/livestatus.o &&
+ install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir/livestatus.o &&
mkdir -p $DESTDIR$bindir &&
install -m 755 src/unixcat $DESTDIR$bindir &&
popd