X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_dig.c;h=5c6f1e12e8bdb45985d0ac535d8c79bdcab1de42;hb=7ceff0d5a95f5c5f34235ef6682595f169864d2f;hp=975986da6275bbcef2cbd41d38736f0ca3d8fb36;hpb=6692168ec07fb87907aaccc66b644e105e6d5754;p=nagiosplug.git

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 975986d..5c6f1e1 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -25,7 +25,7 @@
 #include "utils.h"
 #include "popen.h"
 
-#define PROGNAME "check_dig"
+const char *progname = "check_dig";
 #define REVISION "$Revision$"
 #define COPYRIGHT "2000-2002"
 #define AUTHOR "Karl DeBisschop"
@@ -88,11 +88,11 @@ main (int argc, char **argv)
 				input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
 
 			if (strstr (input_buffer, query_address) == input_buffer) {
-				output = strscpy (output, input_buffer);
+				asprintf (&output, input_buffer);
 				result = STATE_OK;
 			}
 			else {
-				strscpy (output, "Server not found in ANSWER SECTION");
+				asprintf (&output, "Server not found in ANSWER SECTION");
 				result = STATE_WARNING;
 			}
 
@@ -102,7 +102,7 @@ main (int argc, char **argv)
 	}
 
 	if (result != STATE_OK) {
-		strscpy (output, "No ANSWER SECTION found");
+		asprintf (&output, "No ANSWER SECTION found");
 	}
 
 	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
@@ -110,7 +110,7 @@ main (int argc, char **argv)
 		result = max_state (result, STATE_WARNING);
 		printf ("%s", input_buffer);
 		if (strlen (output) == 0)
-			strscpy (output, 1 + index (input_buffer, ':'));
+			asprintf (&output, 1 + index (input_buffer, ':'));
 	}
 
 	(void) fclose (child_stderr);
@@ -119,13 +119,13 @@ main (int argc, char **argv)
 	if (spclose (child_process)) {
 		result = max_state (result, STATE_WARNING);
 		if (strlen (output) == 0)
-			strscpy (output, "dig returned error status");
+			asprintf (&output, "dig returned error status");
 	}
 
 	(void) time (&end_time);
 
-	if (output == NULL || strcmp (output, "") == 0 || strlen (output) == 0 || strspn (output, " \t\r\n") == strlen (output))
-		strscpy (output, " Probably a non-existent host/domain");
+	if (output == NULL || strlen (output) == 0)
+		asprintf (&output, " Probably a non-existent host/domain");
 
 	if (result == STATE_OK)
 		printf ("DNS ok - %d seconds response time (%s)\n",
@@ -197,7 +197,7 @@ process_arguments (int argc, char **argv)
 			}
 			break;
 		case 'V':									/* version */
-			print_revision (PROGNAME, "$Revision$");
+			print_revision (progname, "$Revision$");
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -216,7 +216,7 @@ process_arguments (int argc, char **argv)
 			}
 		}
 		else {
-			dns_server = strscpy (NULL, "127.0.0.1");
+			asprintf (&dns_server, "127.0.0.1");
 		}
 	}
 
@@ -240,7 +240,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (PROGNAME, "$Revision$");
+	print_revision (progname, "$Revision$");
 	printf
 		("Copyright (c) %s %s <%s>\n\n%s\n",
 		 COPYRIGHT, AUTHOR, EMAIL, SUMMARY);
@@ -272,5 +272,5 @@ print_usage (void)
 	printf
 		("Usage: %s -H host -l lookup [-t timeout] [-v]\n"
 		 "       %s --help\n"
-		 "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+		 "       %s --version\n", progname, progname, progname);
 }