fixes from richard brodie (tracker id 1216576)

[nagiosplug.git] / plugins / check_users.c

diff --git a/plugins/check_users.c b/plugins/check_users.c
index 0417bad165f5b5d42327633ab0282edb7cf61795..25d04ed0b02de0d58a8b24bba49ba64e0fdaf6b4 100644 (file)
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -20,7 +20,7 @@
 
 const char *progname = "check_users";
 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"
@@ -40,7 +40,7 @@ int
 main (int argc, char **argv)
 {
        int users = -1;
-       int result = STATE_OK;
+       int result = STATE_UNKNOWN;
        char input_buffer[MAX_INPUT_BUFFER];
        char *perf;
 
@@ -51,7 +51,7 @@ main (int argc, char **argv)
        perf = strdup("");
 
        if (process_arguments (argc, argv) == ERROR)
-               usage (_("check_users: could not parse arguments\n"));
+               usage4 (_("Could not parse arguments"));
 
        /* run the command */
        child_process = spopen (WHO_COMMAND);
@@ -140,9 +140,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':                                                                       /* print short usage statement if args not parsable */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                case 'h':                                                                       /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -151,13 +149,13 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                case 'c':                                                                       /* critical */
                        if (!is_intnonneg (optarg))
-                               usage (_("Critical threshold must be a positive integer\n"));
+                               usage4 (_("Critical threshold must be a positive integer"));
                        else
                                cusers = atoi (optarg);
                        break;
                case 'w':                                                                       /* warning */
                        if (!is_intnonneg (optarg))
-                               usage (_("Warning threshold must be a positive integer\n"));
+                               usage4 (_("Warning threshold must be a positive integer"));
                        else
                                wusers = atoi (optarg);
                        break;
@@ -167,14 +165,14 @@ process_arguments (int argc, char **argv)
        c = optind;
        if (wusers == -1 && argc > c) {
                if (is_intnonneg (argv[c]) == FALSE)
-                       usage (_("Warning threshold must be a positive integer\n"));
+                       usage4 (_("Warning threshold must be a positive integer"));
                else
                        wusers = atoi (argv[c++]);
        }
 
        if (cusers == -1 && argc > c) {
                if (is_intnonneg (argv[c]) == FALSE)
-                       usage (_("Warning threshold must be a positive integer\n"));
+                       usage4 (_("Warning threshold must be a positive integer"));
                else
                        cusers = atoi (argv[c]);
        }
@@ -210,10 +208,8 @@ system and generates an error if the number exceeds the thresholds specified.\n"
 }
 
 
-
 void
 print_usage (void)
 {
        printf ("Usage: %s -w <users> -c <users>\n", progname);
-       printf (_(UT_HLP_VRS), progname, progname);
 }