X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_radius.c;h=c71f3b4c37772de2d345c5c065568b77fec53d5b;hb=97ecfa6226bea7c09f78b2b92d807e73467ffc08;hp=c346dc77d43de39a3bfb7dabf1dd9550be4d0c23;hpb=2a68978c564e53cddc90882ee7776a43839dfcff;p=nagiosplug.git

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index c346dc7..c71f3b4 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 
-#define PROGNAME "check_radius"
+const char *progname = "check_radius";
 #define REVISION "$Revision$"
 #define COPYRIGHT "1999-2001"
 #define AUTHORS "Robert August Vincent II/Karl DeBisschop"
@@ -112,7 +112,7 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 <manvolnum>5<manvolnum>
 </refmeta>
 <refnamdiv>
-<refname>&PROGNAME;</refname>
+<refname>&progname;</refname>
 <refpurpose>&SUMMARY;</refpurpose>
 </refnamdiv>
 </refentry>
@@ -208,7 +208,6 @@ process_arguments (int argc, char **argv)
 {
 	int c;
 
-#ifdef HAVE_GETOPT_H
 	int option_index = 0;
 	static struct option long_options[] = {
 		{"hostname", required_argument, 0, 'H'},
@@ -224,7 +223,6 @@ process_arguments (int argc, char **argv)
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}
 	};
-#endif
 
 	if (argc < 2)
 		return ERROR;
@@ -251,27 +249,22 @@ process_arguments (int argc, char **argv)
 	}
 
 	while (1) {
-#ifdef HAVE_GETOPT_H
-		c =
-			getopt_long (argc, argv, "+hVvH:P:F:u:p:t:r:e:", long_options,
+		c = getopt_long (argc, argv, "+hVvH:P:F:u:p:t:r:e:", long_options,
 									 &option_index);
-#else
-		c = getopt (argc, argv, "+hVvH:P:F:u:p:t:r:e:");
-#endif
 
 		if (c == -1 || c == EOF || c == 1)
 			break;
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf ("%s: Unknown argument: %s\n\n", my_basename (argv[0]), optarg);
+			printf ("%s: Unknown argument: %s\n\n", progname, optarg);
 			print_usage ();
 			exit (STATE_UNKNOWN);
 		case 'h':									/* help */
 			print_help ();
 			exit (OK);
 		case 'V':									/* version */
-			print_revision (my_basename (argv[0]), "$Revision$");
+			print_revision (progname, "$Revision$");
 			exit (OK);
 		case 'v':									/* verbose mode */
 			verbose = TRUE;
@@ -324,7 +317,7 @@ process_arguments (int argc, char **argv)
 void
 print_help (void)
 {
-	print_revision (PROGNAME, REVISION);
+	print_revision (progname, REVISION);
 	printf
 		("Copyright (c) %s %s <%s>\n\n%s\n",
 		 COPYRIGHT, AUTHORS, EMAIL, SUMMARY);
@@ -340,12 +333,7 @@ void
 print_usage (void)
 {
 	printf ("Usage:\n" " %s %s\n"
-#ifdef HAVE_GETOPT_H
 					" %s (-h | --help) for detailed help\n"
 					" %s (-V | --version) for version information\n",
-#else
-					" %s -h for detailed help\n"
-					" %s -V for version information\n",
-#endif
-					PROGNAME, OPTIONS, PROGNAME, PROGNAME);
+					progname, OPTIONS, progname, progname);
 }