diff options
Diffstat (limited to 'plugins/negate.c')
| -rw-r--r-- | plugins/negate.c | 107 |
1 files changed, 49 insertions, 58 deletions
diff --git a/plugins/negate.c b/plugins/negate.c index 8b2dff0e..cbde6a12 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -77,12 +77,12 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" #include "utils.h" -#include "popen.h" +#include "utils_cmd.h" -char *command_line; +//char *command_line; -int process_arguments (int, char **); -int validate_arguments (void); +static const char **process_arguments (int, char **); +int validate_arguments (char **); void print_help (void); void print_usage (void); @@ -93,13 +93,15 @@ main (int argc, char **argv) { int found = 0, result = STATE_UNKNOWN; char *buf; + char **command_line; + output chld_out, chld_err; + int i; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - if (process_arguments (argc, argv) == ERROR) - usage4 (_("Could not parse arguments")); + command_line = (char **) process_arguments (argc, argv); /* Set signal handling and alarm */ if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) @@ -107,36 +109,26 @@ main (int argc, char **argv) (void) alarm ((unsigned) timeout_interval); - child_process = spopen (command_line); - if (child_process == NULL) - die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line); - - child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r"); - - if (child_stderr == NULL) { - printf (_("Could not open stderr for %s\n"), command_line); + /* catch when the command is quoted */ + if(command_line[1] == NULL) { + result = cmd_run (command_line[0], &chld_out, &chld_err, 0); + } else { + result = cmd_run_array (command_line, &chld_out, &chld_err, 0); } - - buf = malloc(MAX_INPUT_BUFFER); - while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) { - found++; - printf ("%s", buf); + if (chld_err.lines > 0) { + printf ("Error output from command:\n"); + for (i = 0; i < chld_err.lines; i++) { + printf ("%s\n", chld_err.line[i]); + } + exit (STATE_WARNING); } - if (!found) - die (STATE_UNKNOWN, - _("%s problem - No data received from host\nCMD: %s\n"),\ - argv[0], command_line); - - /* close the pipe */ - result = spclose (child_process); - - /* WARNING if output found on stderr */ - if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) - result = max_state (result, STATE_WARNING); + if (chld_out.lines == 0) + die (STATE_UNKNOWN, _("No data returned from command\n")); - /* close stderr */ - (void) fclose (child_stderr); + for (i = 0; i < chld_out.lines; i++) { + printf ("%s\n", chld_out.line[i]); + } if (result == STATE_OK) exit (STATE_CRITICAL); @@ -167,7 +159,7 @@ is a only a 'timeout' option.</para> /* process command-line arguments */ -int +static const char ** process_arguments (int argc, char **argv) { int c; @@ -181,8 +173,7 @@ process_arguments (int argc, char **argv) }; while (1) { - c = getopt_long (argc, argv, "+hVt:", - longopts, &option); + c = getopt_long (argc, argv, "+hVt:", longopts, &option); if (c == -1 || c == EOF) break; @@ -207,12 +198,9 @@ process_arguments (int argc, char **argv) } } - asprintf (&command_line, "%s", argv[optind]); - for (c = optind+1; c < argc; c++) { - asprintf (&command_line, "%s %s", command_line, argv[c]); - } + validate_arguments (&argv[optind]); - return validate_arguments (); + return (const char **) &argv[optind]; } @@ -230,11 +218,13 @@ process_arguments (int argc, char **argv) int -validate_arguments () +validate_arguments (char **command_line) { - if (command_line == NULL) - return ERROR; - return STATE_OK; + if (command_line[0] == NULL) + usage4 (_("Could not parse arguments")); + + if (strncmp(command_line[0],"/",1) != 0 && strncmp(command_line[0],"./",2) != 0) + usage4 (_("Require path to command")); } /****************************************************************************** @@ -256,7 +246,7 @@ print_help (void) printf ("%s\n", _("Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); @@ -265,19 +255,20 @@ print_help (void) printf (_(UT_TIMEOUT), DEFAULT_TIMEOUT); printf (" %s\n", _("[keep timeout than the plugin timeout to retain CRITICAL status]")); - printf ("\n"); - printf ("%s\n", _("Examples:")); - printf (" %s\n", "negate \"/usr/local/nagios/libexec/check_ping -H host\""); - printf (" %s\n", _("Run check_ping and invert result. Must use full path to plugin")); - printf (" %s\n", "negate \"/usr/local/nagios/libexec/check_procs -a 'vi negate.c'\""); - printf (" %s\n", _("Use single quotes if you need to retain spaces")); - printf (_(UT_VERBOSE)); - printf ("\n"); - printf ("%s\n", _("Notes:")); + printf ("\n"); + printf ("%s\n", _("Examples:")); + printf (" %s\n", "negate /usr/local/nagios/libexec/check_ping -H host"); + printf (" %s\n", _("Run check_ping and invert result. Must use full path to plugin")); + printf (" %s\n", "negate /usr/local/nagios/libexec/check_procs -a 'vi negate.c'"); + printf (" %s\n", _("Use single quotes if you need to retain spaces")); + printf (_(UT_VERBOSE)); + printf ("\n"); + printf ("%s\n", _("Notes:")); printf ("%s\n", _("This plugin is a wrapper to take the output of another plugin and invert it.")); - printf ("%s\n", _("If the wrapped plugin returns STATE_OK, the wrapper will return STATE_CRITICAL.")); - printf ("%s\n", _("If the wrapped plugin returns STATE_CRITICAL, the wrapper will return STATE_OK.")); - printf ("%s\n", _("Otherwise, the output state of the wrapped plugin is unchanged.")); + printf ("%s\n", _("The full path of the plugin must be provided.")); + printf ("%s\n", _("If the wrapped plugin returns STATE_OK, the wrapper will return STATE_CRITICAL.")); + printf ("%s\n", _("If the wrapped plugin returns STATE_CRITICAL, the wrapper will return STATE_OK.")); + printf ("%s\n", _("Otherwise, the output state of the wrapped plugin is unchanged.")); printf (_(UT_SUPPORT)); } @@ -287,6 +278,6 @@ print_help (void) void print_usage (void) { - printf (_("Usage:")); + printf (_("Usage:")); printf ("%s [-t timeout] <definition of wrapped plugin>\n",progname); } |