diff --git a/plugins/popen.c b/plugins/popen.c
index 5da12a02fb46a22d7af22bc7fabe9adddc41e7ce..a27aecc9a8f444d92a4cc1fe01e7e966f5f9d0cd 100644 (file)
--- a/plugins/popen.c
+++ b/plugins/popen.c
-/******************************************************************************
- * popen.c
- *
- * A safe alternative to popen
- *
- * Provides spopen and spclose
-
-FILE * spopen(const char *);
-int spclose(FILE *);
-
- *
- * Code taken with liitle modification from "Advanced Programming for the Unix
- * Environment" by W. Richard Stevens
- *
- * This is considered safe in that no shell is spawned, and the environment and
- * path passed to the exec'd program are esstially empty. (popen create a shell
- * and passes the environment to it).
- *
- * $Id$
- *
- ******************************************************************************/
+/*****************************************************************************
+*
+* Nagios plugins popen
+*
+* License: GPL
+* Copyright (c) 2005-2007 Nagios Plugins Development Team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* A safe alternative to popen
+*
+* Provides spopen and spclose
+*
+* FILE * spopen(const char *);
+* int spclose(FILE *);
+*
+* Code taken with liitle modification from "Advanced Programming for the Unix
+* Environment" by W. Richard Stevens
+*
+* This is considered safe in that no shell is spawned, and the environment
+* and path passed to the exec'd program are essentially empty. (popen create
+* a shell and passes the environment to it).
+*
+*
+* 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/>.
+*
+* $Id$
+*
+*****************************************************************************/
#include "common.h"
char *env[2];
char *cmd = NULL;
char **argv = NULL;
- char *str;
+ char *str, *tmp;
int argc;
int i = 0, pfd[2], pfderr[2];
/* there cannot be more args than characters */
argc = strlen (cmdstring) + 1; /* add 1 for NULL termination */
argv = malloc (sizeof(char*)*argc);
-
+
if (argv == NULL) {
- printf (_("Could not malloc argv array in popen()\n"));
+ printf ("%s\n", _("Could not malloc argv array in popen()"));
return NULL;
}
str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
if (i >= argc - 2) {
- printf (_("CRITICAL - You need more args!!!\n"));
+ printf ("%s\n",_("CRITICAL - You need more args!!!"));
return (NULL);
}
cmd = 1 + strstr (str, "'");
str[strcspn (str, "'")] = 0;
}
- else {
+ else if (strcspn(str,"'") < strcspn (str, " \t\r\n")) {
+ /* handle --option='foo bar' strings */
+ tmp = str + strcspn(str, "'") + 1;
+ if (!strstr (tmp, "'"))
+ return NULL; /* balanced? */
+ tmp += strcspn(tmp,"'") + 1;
+ *tmp = 0;
+ cmd = tmp + 1;
+ } else {
if (strpbrk (str, " \t\r\n")) {
cmd = 1 + strpbrk (str, " \t\r\n");
str[strcspn (str, " \t\r\n")] = 0;
printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
timeout_interval);
} else {
- printf (_("CRITICAL - popen timeout received, but no child process\n"));
+ printf ("%s\n", _("CRITICAL - popen timeout received, but no child process"));
}
exit (STATE_CRITICAL);
}