[Nagios-devel] [PATCH] bring contrib daemonchk.cgi building into

[Guest]

also change internal functions visibility via static
---
contrib/Makefile.in | 15 +++++++++------
contrib/daemonchk.c | 35 ++++++++++++++++++-----------------
2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 9b9ede2..addf145 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -9,6 +9,7 @@ CFLAGS=@CFLAGS@ @DEFS@
LDFLAGS=@LDFLAGS@ @LIBS@

# Source code directories
+SRC_INCLUDE=../include
SRC_COMMON=../common
SRC_CGI=../cgi

@@ -23,15 +24,15 @@ exec_prefix=@exec_prefix@
CGIDIR=@sbindir@
BINDIR=@bindir@

-CGIS=traceroute.cgi
+CGIS=traceroute.cgi daemonchk.cgi
UTILS=mini_epn new_mini_epn convertcfg
ALL=$(CGIS) $(UTILS)


CGI_C=$(SRC_CGI)/getcgi.c
CGI_O=$(SRC_CGI)/getcgi.o $(SNPRINTF_O)
-CGI_H=$(SRC_CGI)/getcgi.h
-COMMON_H=$(SRC_COMMON)/config.h $(SRC_COMMON)/common.h $(SRC_COMMON)/locations.h
+CGI_H=$(SRC_INCLUDE)/getcgi.h
+COMMON_H=$(SRC_INCLUDE)/config.h $(SRC_INCLUDE)/common.h $(SRC_INCLUDE)/locations.h

##############################################################################
# standard targets (all, clean, distclean, devclean, install)
@@ -58,9 +59,11 @@ install:
##############################################################################
# rules and dependencies for actual target programs

-daemonchk.cgi:
- @echo "This doesn't work with Nagios 2.x yet..."
-# daemonchk.c $(CGI_O) $(CGI_H) $(COMMON_H)
+daemonchk.cgi: daemonchk.o $(CGI_O) $(CGI_H) $(COMMON_H)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $
#endif
@@ -11,13 +11,14 @@
#define CHARLEN 256
#define max(a,b) ((a)>(b))?(a):(b)

-void document_header(void);
-void document_footer(void);
-int process_cgivars(void);
+static void document_header(void);
+//static void document_footer(void);
+static int process_cgivars(void);

-char *strscpy(char *dest, const char *src);
-char *ssprintf(char *str, const char *fmt, ...);
-void terminate (int result, const char *fmt, ...);
+static char *strscpy(char *dest, const char *src);
+static char *ssprintf(char *str, const char *fmt, ...);
+static void terminate (int result, const char *fmt, ...);
+static void get_expire_time_string(time_t *raw_time,char *buffer,int buffer_length);

int main (int argc, char **argv){
FILE *fp;
@@ -138,7 +139,7 @@ int main (int argc, char **argv){

}

-void document_header(void){
+static void document_header(void){
char date_time[48];
time_t current_time;

@@ -157,7 +158,7 @@ void document_header(void){
return;
}

-int process_cgivars(void){
+static int process_cgivars(void){
char **variables;
int error=FALSE;
int x;
@@ -176,7 +177,7 @@ int process_cgivars(void){
}

/* get date/time string used in META tags for page expiration */
-void get_expire_time_string(time_t *raw_time,char *buffer,int buffer_length){
+static void get_expire_time_string(time_t *raw_time,char *buffer,int buffer_length){
time_t t;
struct tm *tm_ptr;
int day;
@@ -206,7 +207,7 @@ void get_expire_time_string(time_t *raw_time,char *buffer,int buffer_length){
return;
}

-char *strscpy(char *dest, const char *src)
+static char *strscpy(char *dest, const char *src)
{
int len;

@@ -225,7 +226,7 @@ char *strscpy(char *dest, const char *src)
return dest;
}

-char *ssprintf(char *str, const char *fmt, ...)
+static char *ssprintf(char *str, const char *fmt, ...)
{
va_list ap;
int nchars;
@@ -263,7 +264,7 @@ char *ssprintf(char *str, const char *fmt, ...)

}

-void terminate (int result, const char *fmt, ...)
+static void terminate (int result, const char *fmt, ...)
{
va_list ap;
va_

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]