Merge branch 'master' into master

1 files changed, 3 insertions, 5 deletions

diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index a7155d27..102191e4 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -44,6 +44,8 @@
 # include <sys/wait.h>
 #endif
 
+#include "./utils.h"
+
 /** macros **/
 #ifndef WEXITSTATUS
 # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
@@ -114,10 +116,6 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         env[0] = strdup("LC_ALL=C");
         env[1] = '\0';
 
-        /* if no command was passed, return with no error */
-        if (cmdstring == NULL)
-                return -1;
-
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
         cmdlen = strlen(cmdstring);
@@ -203,7 +201,7 @@ np_runcmd_open(const char *cmdstring, 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]);