- fixed one-line-outputs in curl error buffers

4 files changed, 58 insertions, 0 deletions

diff --git a/src/GNUmakefile b/src/GNUmakefile
index f28d8b4..07d778c 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -14,6 +14,7 @@ BINS = \
 	check_curl
 
 OBJS = \
+	utils.o \
 	curlhelper.o \
 	cmdline.o
 
diff --git a/src/check_curl.c b/src/check_curl.c
index 556cd92..f95547b 100644
--- a/src/check_curl.c
+++ b/src/check_curl.c
@@ -174,6 +174,7 @@ int main( int argc, char *argv[] ) {
 
 	/* Curl errors, result in critical Nagios state */
 	if( res != CURLE_OK ) {
+		remove_newlines( errbuf );
 		printf( "HTTP CRITICAL - %s (error: %d)\n", errbuf, res );
 		curlhelp_freebuffer( &body_buf );
 		curlhelp_freebuffer( &header_buf );
diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..f6ccaab
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,32 @@
+/*
+    check_curl - Nagios Curl-based check plugin
+    Copyright (C) 2008  Andreas Baumann
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define _XOPEN_SOURCE 600
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "utils.h"
+
+void remove_newlines( char *s ) {
+	char *p;
+
+	for( p = s; *p != '\0'; p++ )
+		if( *p == '\r' || *p == '\n' )
+			*p = ' ';
+}
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..cc7e4c4
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,24 @@
+/*
+    check_curl - Nagios Curl-based check plugin
+    Copyright (C) 2008  Andreas Baumann
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __UTILS_H
+#define __UTILS_H
+
+void remove_newlines( char *s );
+
+#endif /* __UTILS_H */