check_disk working with mountlist.c

[nagiosplug.git] / plugins / check_ups.c

diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 470e3be749ea4acd02221429db8b7b9e8deed4d7..b077d31fe607bfbadb3171f8b16be4d58e3abfc5 100644 (file)
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -56,7 +56,7 @@
 #include "netutils.h"
 #include "utils.h"
 
-#define PROGNAME "check_ups"
+const char *progname = "check_ups";
 #define REVISION "$Revision$"
 #define COPYRIGHT "1999-2002"
 #define AUTHOR "Ethan Galstad"
@@ -64,7 +64,7 @@
 
 #define CHECK_NONE     0
 
-#define PORT   3305
+#define PORT     3493
 
 #define UPS_NONE     0   /* no supported options */
 #define UPS_UTILITY  1   /* supports utility line voltage */
@@ -434,7 +434,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'},
@@ -448,7 +447,6 @@ process_arguments (int argc, char **argv)
                {"help", no_argument, 0, 'h'},
                {0, 0, 0, 0}
        };
-#endif
 
        if (argc < 2)
                return ERROR;
@@ -463,13 +461,8 @@ process_arguments (int argc, char **argv)
        }
 
        while (1) {
-#ifdef HAVE_GETOPT_H
-               c =
-                       getopt_long (argc, argv, "hVH:u:p:v:c:w:t:", long_options,
+               c = getopt_long (argc, argv, "hVH:u:p:v:c:w:t:", long_options,
                                                                         &option_index);
-#else
-               c = getopt (argc, argv, "hVH:u:p:v:c:w:t:");
-#endif
 
                if (c == -1 || c == EOF)
                        break;
@@ -535,7 +528,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 ();
@@ -571,7 +564,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (PROGNAME, "$Revision$");
+       print_revision (progname, "$Revision$");
        printf
                ("Copyright (c) 2000 Tom Shields/Karl DeBisschop\n\n"
                 "This plugin tests the UPS service on the specified host.\n"
@@ -611,5 +604,5 @@ print_usage (void)
                ("Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n"
                 "            [-t timeout] [-v]\n"
                 "       %s --help\n"
-                "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+                "       %s --version\n", progname, progname, progname);
 }