Fix minor test issues

[nagiosplug.git] / plugins / utils.c

diff --git a/plugins/utils.c b/plugins/utils.c
index 0e79fbdb5f13bb0bec9283d716ff97e10d8c06cc..45373909560552b462ccbb11ecdcc51c1a7a2ca8 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -1,16 +1,26 @@
 /*****************************************************************************
- *
- * utils.c
- *
- * Library of useful functions for plugins
- *
- * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
- * Copyright (c) 2006 Nagios Plugin Development Team
- * License: GPL
- *
- * $Revision$
- * $Date$
- ****************************************************************************/
+* 
+* Library of useful functions for plugins
+* 
+* License: GPL
+* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
+* Copyright (c) 2002-2007 Nagios Plugin Development Team
+* 
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* 
+*****************************************************************************/
 
 #define LOCAL_TIMEOUT_ALARM_HANDLER
 
@@ -53,6 +63,33 @@ max_state (int a, int b)
                return max (a, b);
 }
 
+/* **************************************************************************
+ * max_state_alt(STATE_x, STATE_y)
+ * compares STATE_x to  STATE_y and returns result based on the following
+ * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
+ *
+ * The main difference between max_state_alt and max_state it that it doesn't
+ * allow setting a default to UNKNOWN. It will instead prioritixe any valid
+ * non-OK state.
+ ****************************************************************************/
+
+int
+max_state_alt (int a, int b)
+{
+       if (a == STATE_CRITICAL || b == STATE_CRITICAL)
+               return STATE_CRITICAL;
+       else if (a == STATE_WARNING || b == STATE_WARNING)
+               return STATE_WARNING;
+       else if (a == STATE_UNKNOWN || b == STATE_UNKNOWN)
+               return STATE_UNKNOWN;
+       else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
+               return STATE_DEPENDENT;
+       else if (a == STATE_OK || b == STATE_OK)
+               return STATE_OK;
+       else
+               return max (a, b);
+}
+
 void usage (const char *msg)
 {
        printf ("%s\n", msg);
@@ -101,24 +138,13 @@ usage5 (void)
        exit (STATE_UNKNOWN);
 }
 
-char *
-clean_revstring (const char *revstring)
-{
-       char plugin_revision[STRLEN];
-       plugin_revision[0] = 'v';
-       if (sscanf (revstring,"$Revision: %[0-9.]", plugin_revision + 1) == 1)
-               return strscpy (NULL, plugin_revision);
-       else
-               return strscpy (NULL, "N/A");
-}
-
 void
-print_revision (const char *command_name, const char *revision_string)
+print_revision (const char *command_name, const char *revision)
 {
        char plugin_revision[STRLEN];
 
-       printf ("%s %s (%s %s)\n",
-                command_name, clean_revstring(revision_string), PACKAGE, VERSION);
+       printf ("%s v%s (%s %s)\n",
+                command_name, revision, PACKAGE, VERSION);
 }
 
 const char *
@@ -142,9 +168,9 @@ void
 timeout_alarm_handler (int signo)
 {
        if (signo == SIGALRM) {
-               printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
-                                               timeout_interval);
-               exit (STATE_CRITICAL);
+               printf (_("%s - Plugin timed out after %d seconds\n"),
+                                               state_text(timeout_state), timeout_interval);
+               exit (timeout_state);
        }
 }