X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_dig.c;h=6e0408744f2902ea55d28c42f29fdc7895398ef9;hb=cb448eb1d57259641e10494e8d74d885e44c215d;hp=59c3b7c8f3f3130062136e009d4f36a10224494d;hpb=7283211f00a3a89956d9dfc4a851dc1aaa7a1cf3;p=nagiosplug.git

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 59c3b7c..6e04087 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -1,37 +1,52 @@
-/******************************************************************************
- *
- * Program: SNMP plugin for Nagios
- * License: GPL
- *
- * License Information:
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *****************************************************************************/
+/*****************************************************************************
+*
+* 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 2 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, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****************************************************************************/
+
+const char *progname = "check_dig";
+const char *revision = "$Revision$";
+const char *copyright = "2002-2003";
+const char *authors = "Nagios Plugin Development Team";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+const char *summary = "Test the DNS service on the specified host using dig\n";
+
+const char *option_summary = "-H host -l lookup [-t timeout] [-v]";
+
+const char *options = "\
+ -H, --hostname=STRING or IPADDRESS\n\
+   Check server on the indicated host\n\
+ -l, --lookup=STRING\n\
+   machine name to lookup\n\
+ -t, --timeout=INTEGER\n\
+   Seconds before connection attempt times out (default: %d)\n\
+ -v, --verbose\n\
+   Print extra information (command-line use only)\n";
+
+const char *standard_options = "\
+ -h, --help\n\
+    Print detailed help screen\n\
+ -V, --version\n\
+    Print version information\n\n";
 
 #include "config.h"
 #include "common.h"
 #include "utils.h"
 #include "popen.h"
 
-const char *progname = "check_dig";
-#define REVISION "$Revision$"
-#define COPYRIGHT "2000-2002"
-#define AUTHOR "Karl DeBisschop"
-#define EMAIL "karl@debisschop.net"
-#define SUMMARY "Test the DNS service on the specified host using dig\n"
-
 int process_arguments (int, char **);
 int validate_arguments (void);
 void print_help (void);
@@ -128,7 +143,7 @@ main (int argc, char **argv)
 		asprintf (&output, " Probably a non-existent host/domain");
 
 	if (result == STATE_OK)
-		printf ("DNS ok - %d seconds response time (%s)\n",
+		printf ("DNS OK - %d seconds response time (%s)\n",
 						(int) (end_time - start_time), output);
 	else if (result == STATE_WARNING)
 		printf ("DNS WARNING - %s\n", output);
@@ -210,7 +225,7 @@ process_arguments (int argc, char **argv)
 			}
 		}
 		else {
-			asprintf (&dns_server, "127.0.0.1");
+			dns_server = strdup ("127.0.0.1");
 		}
 	}
 
@@ -226,7 +241,7 @@ validate_arguments (void)
 {
 	return OK;
 }
-
+
 
 
 
@@ -234,25 +249,13 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (progname, "$Revision$");
-	printf
-		("Copyright (c) %s %s <%s>\n\n%s\n",
-		 COPYRIGHT, AUTHOR, EMAIL, SUMMARY);
+	print_revision (progname, revision);
+	printf ("Copyright (c) %s %s\n\t<%s>\n\n", copyright, authors, email);
+	printf (summary);
 	print_usage ();
-	printf
-		("\nOptions:\n"
-		 " -H, --hostname=STRING or IPADDRESS\n"
-		 "   Check server on the indicated host\n"
-		 " -l, --lookup=STRING\n"
-		 "   machine name to lookup\n"
-		 " -t, --timeout=INTEGER\n"
-		 "   Seconds before connection attempt times out (default: %d)\n"
-		 " -v, --verbose\n"
-		 "   Print extra information (command-line use only)\n"
-		 " -h, --help\n"
-		 "   Print detailed help screen\n"
-		 " -V, --version\n"
-		 "   Print version information\n\n", DEFAULT_SOCKET_TIMEOUT);
+	printf ("\nOptions:\n");
+	printf (options, DEFAULT_SOCKET_TIMEOUT);
+	printf (standard_options);
 	support ();
 }
 
@@ -263,8 +266,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf
-		("Usage: %s -H host -l lookup [-t timeout] [-v]\n"
-		 "       %s --help\n"
-		 "       %s --version\n", progname, progname, progname);
+	printf ("Usage: %s %s\n", progname, option_summary);
+	printf ("       %s (-h|--help)\n", progname);
+	printf ("       %s (-V|--version)\n", progname);
 }