still trying to fix #1094326

[nagiosplug.git] / plugins / check_real.c

diff --git a/plugins/check_real.c b/plugins/check_real.c
index 755f6eb2ebc46609d8520eb5e4bb979d0eebe55d..eb892c77fc594d8efbb911cbdffca387c0a934b1 100644 (file)
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -14,11 +14,13 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 ******************************************************************************/
 
 const char *progname = "check_real";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -50,14 +52,11 @@ int verbose = FALSE;
 
 
 
-
-
-\f
 int
 main (int argc, char **argv)
 {
        int sd;
-       int result;
+       int result = STATE_UNKNOWN;
        char buffer[MAX_INPUT_BUFFER];
        char *status_line = NULL;
 
@@ -65,8 +64,8 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("Incorrect arguments supplied\n"));
+       if (process_arguments (argc, argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal (SIGALRM, socket_timeout_alarm_handler);
@@ -251,9 +250,6 @@ main (int argc, char **argv)
 
 
 
-
-
-\f
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -303,7 +299,7 @@ process_arguments (int argc, char **argv)
                        else if (is_host (optarg))
                                server_address = optarg;
                        else
-                               usage2 (_("Invalid host name"), optarg);
+                               usage2 (_("Invalid hostname/address"), optarg);
                        break;
                case 'e':                                                                       /* string to expect in response header */
                        server_expect = optarg;
@@ -316,7 +312,7 @@ process_arguments (int argc, char **argv)
                                server_port = atoi (optarg);
                        }
                        else {
-                               usage (_("Server port must be a positive integer\n"));
+                               usage4 (_("Port must be a positive integer"));
                        }
                        break;
                case 'w':                                                                       /* warning time threshold */
@@ -325,7 +321,7 @@ process_arguments (int argc, char **argv)
                                check_warning_time = TRUE;
                        }
                        else {
-                               usage (_("Warning time must be a nonnegative integer\n"));
+                               usage4 (_("Warning time must be a positive integer"));
                        }
                        break;
                case 'c':                                                                       /* critical time threshold */
@@ -334,7 +330,7 @@ process_arguments (int argc, char **argv)
                                check_critical_time = TRUE;
                        }
                        else {
-                               usage (_("Critical time must be a nonnegative integer\n"));
+                               usage4 (_("Critical time must be a positive integer"));
                        }
                        break;
                case 'v':                                                                       /* verbose */
@@ -345,17 +341,17 @@ process_arguments (int argc, char **argv)
                                socket_timeout = atoi (optarg);
                        }
                        else {
-                               usage (_("Time interval must be a nonnegative integer\n"));
+                               usage4 (_("Timeout interval must be a positive integer"));
                        }
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (progname, "$Revision$");
+                       print_revision (progname, revision);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* usage */
-                       usage (_("Invalid argument\n"));
+                       usage2 (_("Unknown argument"), optarg);
                }
        }
 
@@ -365,12 +361,12 @@ process_arguments (int argc, char **argv)
                        server_address = argv[c++];
                }
                else {
-                       usage2 (_("Invalid host name"), argv[c]);
+                       usage2 (_("Invalid hostname/address"), argv[c]);
                }
        }
 
        if (server_address==NULL)
-               usage (_("You must provide a server to check\n"));
+               usage4 (_("You must provide a server to check"));
 
        if (host_name==NULL)
                host_name = strdup (server_address);
@@ -383,8 +379,6 @@ process_arguments (int argc, char **argv)
 
 
 
-
-
 int
 validate_arguments (void)
 {
@@ -393,15 +387,13 @@ validate_arguments (void)
 
 
 
-
-\f
 void
 print_help (void)
 {
        char *myport;
        asprintf (&myport, "%d", PORT);
 
-       print_revision (progname, "$Revision$");
+       print_revision (progname, revision);
 
        printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
        printf (COPYRIGHT, copyright, email);
@@ -439,13 +431,10 @@ values."));
 
 
 
-
-
 void
 print_usage (void)
 {
        printf ("\
 Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n\
-  [-t timeout] [-v]\n", progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+                  [-t timeout] [-v]\n", progname);
 }