9 files changed, 28 insertions, 31 deletions

diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 25abc89..547af43 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -78,7 +78,7 @@ static char *default_file_in_path(void);
 /*
  * Parse_locator decomposes a string of the form
  *      [stanza][@filename]
- * into its seperate parts.
+ * into its separate parts.
  */
 static void
 parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
@@ -169,7 +169,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
                 if (isspace(c))
                         continue;
                 switch (c) {
-                        /* globble up coment lines */
+                        /* globble up comment lines */
                 case ';':
                 case '#':
                         GOBBLE_TO(f, c, '\n');
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 29ca42a..4bb60aa 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -176,14 +176,14 @@ main (int argc, char **argv)
         ok (result == UNSET, "(initialised) Checking exit code is reset");
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/echo3456 non-existant command");
+        strcpy(command, "/bin/echo3456 non-existent command");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
-                        "Non existant command, so no output");
+                        "Non existent command, so no output");
         ok (chld_err.lines == 0,
                         "No stderr either");
-        ok (result == 3, "Get return code 3 (?) for non-existant command");
+        ok (result == 3, "Get return code 3 (?) for non-existent command");
 
 
         /* ensure everything is empty again */
@@ -192,14 +192,14 @@ main (int argc, char **argv)
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/sh non-existant-file");
+        strcpy(command, "/bin/sh non-existent-file");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
                         "/bin/sh returns no stdout when file is missing...");
         ok (chld_err.lines == 1,
                         "...but does give an error line");
-        ok (strstr(chld_err.line[0],"non-existant-file") != NULL, "And missing filename is in error message");
+        ok (strstr(chld_err.line[0],"non-existent-file") != NULL, "And missing filename is in error message");
         ok (result != 0, "Get non-zero return code from /bin/sh");
 
 
@@ -219,11 +219,11 @@ main (int argc, char **argv)
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/non-existant-command");
+        strcpy(command, "/bin/non-existent-command");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
-                        "/bin/non-existant-command returns no stdout...");
+                        "/bin/non-existent-command returns no stdout...");
         ok (chld_err.lines == 0,
                         "...and no stderr output either");
         ok (result == 3, "Get return code 3 = UNKNOWN when command does not exist");
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index f6477ac..9bd68c7 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -88,10 +88,10 @@ main (int argc, char **argv)
                                   cflags, 3,strdup("regex on dev names:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"),
                                   cflags, 0,
-                                  strdup("regex on non existant dev/path:"));
+                                  strdup("regex on non existent dev/path:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"),
                                   cflags | REG_ICASE,0,
-                                  strdup("regi on non existant dev/path:"));
+                                  strdup("regi on non existent dev/path:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"),
                                   cflags, 3,
                                   strdup("partial devname regex match:"));
diff --git a/lib/tests/test_ini3.t b/lib/tests/test_ini3.t
index a2ca94a..41169db 100755
--- a/lib/tests/test_ini3.t
+++ b/lib/tests/test_ini3.t
@@ -10,7 +10,7 @@ if (! -e "./test_ini3") {
 # array of argument arrays
 #   - First value is the expected return code
 #   - 2nd value is the NAGIOS_CONFIG_PATH
-#     TODO: looks like we look in default path after looking trough this variable - shall we?
+#     TODO: looks like we look in default path after looking through this variable - shall we?
 #   - 3rd value is the plugin name
 #   - 4th is the ini locator
 my @TESTS = (
diff --git a/lib/tests/test_opts3.t b/lib/tests/test_opts3.t
index 8d974ca..d77a35c 100755
--- a/lib/tests/test_opts3.t
+++ b/lib/tests/test_opts3.t
@@ -10,7 +10,7 @@ if (! -e "./test_opts3") {
 # array of argument arrays
 #   - First value is the expected return code
 #   - 2nd value is the NAGIOS_CONFIG_PATH
-#     TODO: looks like we look in default path after looking trough this variable - shall we?
+#     TODO: looks like we look in default path after looking through this variable - shall we?
 #   - 3rd value is the plugin name
 #   - 4th and up are arguments
 my @TESTS = (
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index bc00fac..7b10494 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -395,7 +395,7 @@ main (int argc, char **argv)
         ok( temp_state_data==NULL, "Older data version gives NULL" );
         temp_state_key->data_version=54;
 
-        temp_state_key->_filename="var/nonexistant";
+        temp_state_key->_filename="var/nonexistent";
         temp_state_data = np_state_read();
         ok( temp_state_data==NULL, "Missing file gives NULL" );
         ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
diff --git a/lib/utils_base.c b/lib/utils_base.c
index eb1823b..c458cf6 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -24,7 +24,7 @@
 *
 *****************************************************************************/
 
-#include "common.h"
+#include "../plugins/common.h"
 #include <stdarg.h>
 #include "utils_base.h"
 #include <ctype.h>
@@ -319,18 +319,18 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
 
         while (1) {
                 /* Strip any leading space */
-                for (varlist; isspace(varlist[0]); varlist++);
+                for (; isspace(varlist[0]); varlist++);
 
                 if (strncmp(name, varlist, strlen(name)) == 0) {
                         varlist += strlen(name);
                         /* strip trailing spaces */
-                        for (varlist; isspace(varlist[0]); varlist++);
+                        for (; isspace(varlist[0]); varlist++);
 
                         if (varlist[0] == '=') {
                                 /* We matched the key, go past the = sign */
                                 varlist++;
                                 /* strip leading spaces */
-                                for (varlist; isspace(varlist[0]); varlist++);
+                                for (; isspace(varlist[0]); varlist++);
 
                                 if (tmp = index(varlist, sep)) {
                                         /* Value is delimited by a comma */
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 795840d..34fb390 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -118,10 +118,6 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
 
         int i = 0;
 
-        /* if no command was passed, return with no error */
-        if (argv == NULL)
-                return -1;
-
         if (!_cmd_pids)
                 CMD_INIT;
 
@@ -161,7 +157,7 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
         }
 
         /* parent picks up execution here */
-        /* close childs descriptors in our address space */
+        /* close children descriptors in our address space */
         close (pfd[1]);
         close (pfderr[1]);
 
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 468769b..582d3ea 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -147,24 +147,25 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
 
       /* set best match if path name exactly matches a mounted device name */
       for (me = mount_list; me; me = me->me_next) {
-        if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
-          continue; /* skip if permissions do not suffice for accessing device */
-        if (strcmp(me->me_devname, d->name)==0)
-          best_match = me;
+        if (strcmp(me->me_devname, d->name)==0) {
+          if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
+            best_match = me;
+          }
+        }
       }
 
       /* set best match by directory name if no match was found by devname */
       if (! best_match) {
         for (me = mount_list; me; me = me->me_next) {
-          if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
-            continue; /* skip if permissions do not suffice for accessing device */
           size_t len = strlen (me->me_mountdir);
           if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
              (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))
              || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0))
           {
-            best_match = me;
-            best_match_len = len;
+            if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
+              best_match = me;
+              best_match_len = len;
+            }
           }
         }
       }