Added argc checks before attempting to access argv[]

[nagiosplug.git] / plugins / utils.c

diff --git a/plugins/utils.c b/plugins/utils.c
index da9cceddd7fa8a95287124f76c7c348ecec3c36c..aaa9fe5ab7c74bdb4f9b703b4a892097b3e46e24 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -18,11 +18,11 @@
 #include <limits.h>
 
 extern int timeout_interval;
+extern const char *progname;
 
-char *my_basename (char *);
 void support (void);
 char *clean_revstring (const char *);
-void print_revision (char *, const char *);
+void print_revision (const char *, const char *);
 void terminate (int, const char *fmt, ...);
 RETSIGTYPE timeout_alarm_handler (int);
 
@@ -57,8 +57,6 @@ char *strpcat (char *dest, const char *src, const char *str);
 #define STRLEN 64
 #define TXTBLK 128
 
-#define max(a,b) ((a)>(b))?(a):(b)
-
 /* **************************************************************************
  * max_state(STATE_x, STATE_y)
  * compares STATE_x to  STATE_y and returns result based on the following
@@ -67,8 +65,10 @@ char *strpcat (char *dest, const char *src, const char *str);
  * Note that numerically the above does not hold
  ****************************************************************************/
 
+#define max(a,b) (((a)>(b))?(a):(b))
+
 int
-max_state(int a, int b)
+max_state (int a, int b)
 {
        if (a == STATE_CRITICAL || b == STATE_CRITICAL)
                return STATE_CRITICAL;
@@ -84,13 +84,26 @@ max_state(int a, int b)
                return max (a, b);
 }
 
-char *
-my_basename (char *path)
+void usage (char *msg)
 {
-       if (!strstr (path, "/"))
-               return path;
-       else
-               return 1 + strrchr (path, '/');
+       printf (msg);
+       print_usage ();
+       exit (STATE_UNKNOWN);
+}
+
+void usage2(char *msg, char *arg)
+{
+       printf ("%s: %s - %s\n",progname,msg,arg);
+       print_usage ();
+       exit (STATE_UNKNOWN);
+}
+
+void
+usage3 (char *msg, char arg)
+{
+       printf ("%s: %s - %c\n", progname, msg, arg);
+       print_usage();
+       exit (STATE_UNKNOWN);
 }
 
 
@@ -115,14 +128,14 @@ clean_revstring (const char *revstring)
 }
 
 void
-print_revision (char *command_name, const char *revision_string)
+print_revision (const char *command_name, const char *revision_string)
 {
        char plugin_revision[STRLEN];
 
        if (sscanf (revision_string, "$Revision: %[0-9.]", plugin_revision) != 1)
                strncpy (plugin_revision, "N/A", STRLEN);
        printf ("%s (nagios-plugins %s) %s\n",
-                                       my_basename (command_name), VERSION, plugin_revision);
+                                       progname, VERSION, plugin_revision);
        printf
                ("The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
                 "copies of the plugins under the terms of the GNU General Public License.\n"
@@ -165,6 +178,9 @@ is_dotted_quad (char *address)
        int o1, o2, o3, o4;
        char c[1];
 
+       if (!address)
+               return FALSE;
+
        if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
                return FALSE;
        else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
@@ -185,18 +201,18 @@ is_dotted_quad (char *address)
 int
 is_hostname (char *s1)
 {
-       if (strlen (s1) > 63)
+       if (!s1 || strlen (s1) > 63) {
                return FALSE;
-       if (strcspn
-                       (s1,
-                        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") !=
-                       0) return FALSE;
-       if (strspn (s1, "0123456789-.") == 1)
+       }
+       if (strcspn (s1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") != 0) {
                return FALSE;
+       }
+       if (strspn (s1, "0123456789-.") == 1) {
+               return FALSE;
+       }
        while ((s1 = index (s1, '.'))) {
                s1++;
                if (strspn (s1, "0123456789-.") == 1) {
-                       printf ("%s\n", s1);
                        return FALSE;
                }
        }
@@ -208,33 +224,40 @@ is_numeric (char *number)
 {
        char tmp[1];
        float x;
-       if (sscanf (number, "%f%c", &x, tmp) == 1)
-               return (TRUE);
-       return (FALSE);
+
+       if (!number)
+               return FALSE;
+       else if (sscanf (number, "%f%c", &x, tmp) == 1)
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_positive (char *number)
 {
        if (is_numeric (number) && atof (number) > 0.0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_negative (char *number)
 {
        if (is_numeric (number) && atof (number) < 0.0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_nonnegative (char *number)
 {
        if (is_numeric (number) && atof (number) >= 0.0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
@@ -242,8 +265,9 @@ is_percentage (char *number)
 {
        int x;
        if (is_numeric (number) && (x = atof (number)) >= 0 && x <= 100)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
@@ -251,37 +275,42 @@ is_integer (char *number)
 {
        long int n;
 
-       if (strspn (number, "-0123456789 ") != strlen (number))
-               return (FALSE);
+       if (!number || (strspn (number, "-0123456789 ") != strlen (number)))
+               return FALSE;
 
        n = strtol (number, NULL, 10);
+
        if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_intpos (char *number)
 {
        if (is_integer (number) && atoi (number) > 0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_intneg (char *number)
 {
        if (is_integer (number) && atoi (number) < 0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_intnonneg (char *number)
 {
        if (is_integer (number) && atoi (number) >= 0)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
@@ -289,16 +318,20 @@ is_intpercent (char *number)
 {
        int i;
        if (is_integer (number) && (i = atoi (number)) >= 0 && i <= 100)
-               return (TRUE);
-       return (FALSE);
+               return TRUE;
+       else
+               return FALSE;
 }
 
 int
 is_option (char *str)
 {
-       if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
+       if (!str)
+               return FALSE;
+       else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
                return TRUE;
-       return FALSE;
+       else
+               return FALSE;
 }