remove UT_HLP_VRS from print_usage

[nagiosplug.git] / plugins / check_time.c

diff --git a/plugins/check_time.c b/plugins/check_time.c
index 314b768369559fa8f02d158adbcf694cbcef3555..5d07f545a99268aa11845767a147dc93a2a7e4c0 100644 (file)
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -14,17 +14,19 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 ******************************************************************************/
 
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
 const char *progname = "check_time";
 const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
 enum {
        TIME_PORT = 37
 };
@@ -53,15 +55,15 @@ int
 main (int argc, char **argv)
 {
        int sd;
-       int result;
+       int result = STATE_UNKNOWN;
        time_t conntime;
 
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("Incorrect arguments supplied\n"));
+       if (process_arguments (argc, argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal (SIGALRM, socket_timeout_alarm_handler);
@@ -122,7 +124,7 @@ main (int argc, char **argv)
                else
                        result = STATE_UNKNOWN;
                die (result,
-                                                        _("TIME UNKNOWN - no data on recv() from server %s, port %d\n"),
+                                                        _("TIME UNKNOWN - no data received from server %s, port %d\n"),
                                                         server_address, server_port);
        }
 
@@ -168,9 +170,6 @@ main (int argc, char **argv)
 
 
 
-
-
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -217,7 +216,9 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':                                                                       /* print short usage statement if args not parsable */
-                       usage3 (_("Unknown argument"), optopt);
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                case 'h':                                                                       /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -226,7 +227,7 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                case 'H':                                                                       /* hostname */
                        if (is_host (optarg) == FALSE)
-                               usage2 (_("Invalid host name/address"), optarg);
+                               usage2 (_("Invalid hostname/address"), optarg);
                        server_address = optarg;
                        break;
                case 'w':                                                                       /* warning-variance */
@@ -240,11 +241,11 @@ process_arguments (int argc, char **argv)
                                        check_warning_time = TRUE;
                                }
                                else {
-                                       usage (_("Warning thresholds must be a nonnegative integer\n"));
+                                       usage (_("Warning thresholds must be a positive integer\n"));
                                }
                        }
                        else {
-                               usage (_("Warning threshold must be a nonnegative integer\n"));
+                               usage (_("Warning threshold must be a positive integer\n"));
                        }
                        break;
                case 'c':                                                                       /* critical-variance */
@@ -259,30 +260,30 @@ process_arguments (int argc, char **argv)
                                        check_critical_time = TRUE;
                                }
                                else {
-                                       usage (_("Critical thresholds must be a nonnegative integer\n"));
+                                       usage (_("Critical thresholds must be a positive integer\n"));
                                }
                        }
                        else {
-                               usage (_("Critical threshold must be a nonnegative integer\n"));
+                               usage (_("Critical threshold must be a positive integer\n"));
                        }
                        break;
                case 'W':                                                                       /* warning-connect */
                        if (!is_intnonneg (optarg))
-                               usage (_("Warning threshold must be a nonnegative integer\n"));
+                               usage (_("Warning threshold must be a positive integer\n"));
                        else
                                warning_time = atoi (optarg);
                        check_warning_time = TRUE;
                        break;
                case 'C':                                                                       /* critical-connect */
                        if (!is_intnonneg (optarg))
-                               usage (_("Critical threshold must be a nonnegative integer\n"));
+                               usage (_("Critical threshold must be a positive integer\n"));
                        else
                                critical_time = atoi (optarg);
                        check_critical_time = TRUE;
                        break;
                case 'p':                                                                       /* port */
                        if (!is_intnonneg (optarg))
-                               usage (_("Server port must be a nonnegative integer\n"));
+                               usage (_("Port must be a positive integer\n"));
                        else
                                server_port = atoi (optarg);
                        break;
@@ -301,11 +302,11 @@ process_arguments (int argc, char **argv)
        if (server_address == NULL) {
                if (argc > c) {
                        if (is_host (argv[c]) == FALSE)
-                               usage2 (_("Invalid host name/address"), optarg);
+                               usage2 (_("Invalid hostname/address"), optarg);
                        server_address = argv[c];
                }
                else {
-                       usage (_("Host name was not supplied\n"));
+                       usage (_("Hostname was not supplied\n"));
                }
        }
 
@@ -314,9 +315,6 @@ process_arguments (int argc, char **argv)
 
 
 
-
-
-\f
 void
 print_help (void)
 {
@@ -356,12 +354,10 @@ This plugin will check the time on the specified host.\n\n"));
 
 
 
-
 void
 print_usage (void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n\
-    [-W connect_time] [-C connect_time] [-t timeout]\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+          [-W connect_time] [-C connect_time] [-t timeout]\n", progname);
 }