check_dns needs a space between 'time' and the hostname

[nagiosplug.git] / plugins / check_disk.c

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 437bbbf21aca536cfd2b82f516856f352eae9a59..669a1cd6b1fd62d9488b887a3e748f08a9288da1 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -21,7 +21,7 @@
 const char *progname = "check_disk";
 const char *program_name = "check_disk";       // Required for coreutils libs
 const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -163,8 +163,8 @@ main (int argc, char **argv)
 
        mount_list = read_filesystem_list (0);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("check_disk: could not parse arguments\n"));
+       if (process_arguments (argc, argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        for (me = mount_list; me; me = me->me_next) {
 
@@ -322,7 +322,7 @@ process_arguments (int argc, char **argv)
                                break;
                        }
                        else {
-                               usage (_("Warning threshold must be integer or percentage!\n"));
+                               usage4 (_("Warning threshold must be integer or percentage!"));
                        }
                case 'c':                                                                       /* critical threshold */
                        if (is_intnonneg (optarg)) {
@@ -339,7 +339,7 @@ process_arguments (int argc, char **argv)
                                break;
                        }
                        else {
-                               usage (_("Critical threshold must be integer or percentage!\n"));
+                               usage4 (_("Critical threshold must be integer or percentage!"));
                        }
                case 'u':
                        if (units)
@@ -578,7 +578,7 @@ print_help (void)
 
        printf (_("\
 This plugin checks the amount of used disk space on a mounted file system\n\
-and generates an alert if free space is less than one of the threshold values."));
+and generates an alert if free space is less than one of the threshold values.\n\n"));
 
        print_usage ();
 
@@ -636,10 +636,7 @@ and generates an alert if free space is less than one of the threshold values.")
 void
 print_usage (void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
-        [-v] [-q]\n\
-       %s (-h|--help)\n\
-       %s (-V|--version)\n"),
-               progname,  progname, progname);
+                  [-v] [-q]\n", progname);
 }