Fix for regex input of '|', being output causing problems with Nagios' parsing of

[nagiosplug.git] / plugins / urlize.c

diff --git a/plugins/urlize.c b/plugins/urlize.c
index aeabafd09a1b90d5b027800f7da8fd314071e350..6bb42db029607e39df3e965eec3f419502f31e7f 100644 (file)
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -5,15 +5,13 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the urlize plugin
 * 
 * This plugin wraps the text output of another command (plugin) in HTML <A>
-* tags, thus displaying the plugin output in as a clickable link in the
-* Nagios status screen.  The return status is the same as the invoked plugin.
+* tags, thus displaying the child plugin's output as a clickable link in the
+* Nagios status screen.  This plugin returns the status of the invoked plugin.
 * 
 * 
 * This program is free software: you can redistribute it and/or modify
@@ -29,12 +27,10 @@
 * 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$
 * 
 *****************************************************************************/
 
 const char *progname = "urlize";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2006";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -89,7 +85,7 @@ main (int argc, char **argv)
                        exit (EXIT_SUCCESS);
                        break;
                case 'V':     /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (EXIT_SUCCESS);
                        break;
                case 'u':
@@ -165,20 +161,20 @@ main (int argc, char **argv)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
        printf (COPYRIGHT, copyright, email);
 
        printf ("%s\n", _("This plugin wraps the text output of another command (plugin)"));
-  printf ("%s\n", _("in HTML <A> tags, thus displaying the plugin output in as a clickable link in"));
-  printf ("%s\n", _("the Nagios status screen.  The return status is the same as the invoked plugin."));
+  printf ("%s\n", _("in HTML <A> tags, thus displaying the child plugin's output as a clickable link in"));
+  printf ("%s\n", _("the Nagios status screen.  This plugin returns the status of the invoked plugin."));
 
   printf ("\n\n");
 
        print_usage ();
 
-  printf (_(UT_HELP_VRSN));
+  printf (UT_HELP_VRSN);
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
@@ -190,7 +186,7 @@ print_help (void)
   printf ("    %s\n\n", _("You probably want:"));
   printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 
@@ -198,6 +194,6 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
        printf ("%s <url> <plugin> <arg1> ... <argN>\n", progname);
 }