check_http min size option (680467 - Dave Viner)

[nagiosplug.git] / plugins / urlize.c

diff --git a/plugins/urlize.c b/plugins/urlize.c
index 83c37dac94e90dbfad5cb58a0550223834ddef03..8d6fc3adf1fe9806ffde14f01ecf748017770707 100644 (file)
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -37,22 +37,24 @@
  *
  *****************************************************************************/
 
+const char *progname = "urlize";
+
 #include "common.h"
 #include "utils.h"
 #include "popen.h"
 
-void print_usage (char *);
-void print_help (char *);
+void print_usage (const char *);
+void print_help (const char *);
 
 int
 main (int argc, char **argv)
 {
        int i = 0, found = 0, result = STATE_UNKNOWN;
-       char command_line[MAX_INPUT_BUFFER] = "";
+       char *cmd = NULL;
        char input_buffer[MAX_INPUT_BUFFER];
 
        if (argc < 2) {
-               print_usage (my_basename (argv[0]));
+               print_usage (progname);
                exit (STATE_UNKNOWN);
        }
 
@@ -62,29 +64,29 @@ main (int argc, char **argv)
        }
 
        if (!strcmp (argv[1], "-V") || !strcmp (argv[1], "--version")) {
-               print_revision (my_basename (argv[0]), "$Revision$");
+               print_revision (progname, "$Revision$");
                exit (STATE_OK);
        }
 
        if (argc < 2) {
-               print_usage (my_basename (argv[0]));
+               print_usage (progname);
                exit (STATE_UNKNOWN);
        }
 
-       sprintf (command_line, "%s", argv[2]);
+       asprintf (&cmd, "%s", argv[2]);
        for (i = 3; i < argc; i++) {
-               sprintf (command_line, "%s %s", command_line, argv[i]);
+               asprintf (&cmd, "%s %s", cmd, argv[i]);
        }
 
-       child_process = spopen (command_line);
+       child_process = spopen (cmd);
        if (child_process == NULL) {
-               printf ("Could not open pipe: %s\n", command_line);
+               printf ("Could not open pipe: %s\n", cmd);
                exit (STATE_UNKNOWN);
        }
 
        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
        if (child_stderr == NULL) {
-               printf ("Could not open stderr for %s\n", command_line);
+               printf ("Could not open stderr for %s\n", cmd);
        }
 
        printf ("<A href=\"%s\">", argv[1]);
@@ -101,7 +103,7 @@ main (int argc, char **argv)
 
        if (!found) {
                printf ("%s problem - No data recieved from host\nCMD: %s\n", argv[0],
-                                               command_line);
+                                               cmd);
                exit (STATE_UNKNOWN);
        }
 
@@ -110,7 +112,7 @@ main (int argc, char **argv)
 
        /* WARNING if output found on stderr */
        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-               result = max (result, STATE_WARNING);
+               result = max_state (result, STATE_WARNING);
 
        /* close stderr */
        (void) fclose (child_stderr);
@@ -120,16 +122,15 @@ main (int argc, char **argv)
 }
 
 void
-print_usage (char *cmd)
+print_usage (const char *cmd)
 {
-       printf ("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n",
-                                       my_basename (cmd));
+       printf ("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n",       cmd);
 }
 
 void
-print_help (char *cmd)
+print_help (const char *cmd)
 {
-       print_revision ("urlize", "$Revision$");
+       print_revision (progname, "$Revision$");
        printf
                ("Copyright (c) 2000 Karl DeBisschop (kdebiss@alum.mit.edu)\n\n"
                 "\nThis plugin wraps the text output of another command (plugin) in HTML\n"