Display usage if no argv (Reuben Farrelly)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1106 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b5021fd7287ebba2d95eed8f39c03d38fef6742b..3156d2719c3fe8caf6f282380fa4831af0d85d41 100644 (file)
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -181,11 +181,14 @@ main (int argc, char *argv[])
        while (1) {
                
                o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex);
-               
-               if (o == -1 || o == EOF)
-                       break;
 
                switch (o) {
+               case -1: 
+                                                               /* 
+                                                                * bail out of the switch but not the loop, so
+                                                                * that device can be extracted from argv.
+                                                                */
+                       break;
                case 'd':
                        device = optarg;
                        break;
@@ -226,7 +229,7 @@ main (int argc, char *argv[])
                fd = open (device, O_RDONLY);
 
                if (fd < 0) {
-                       printf (_("CRITICAL - Couldn't open device: %s\n"), strerror (errno));
+                       printf (_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror (errno));
                        return 2;
                }
 
@@ -498,12 +501,13 @@ print_help (void)
        printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
        printf (COPYRIGHT, copyright, email);
 
-       printf(_("This plugin checks this host's IDE hard drive through the (Linux specific) SMART command interface.\n\n"));
+       printf(_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php].\n\n"));
        
        printf ("\
-Usage: %s [DEVICE] [OPTION]\n\
+Usage: %s [OPTION] [DEVICE]\n\
  -d, --device=DEVICE\n\
     Select device DEVICE\n\
+    Note: if the device is selected with this option, _no_ other options are accepted\n\
  -i, --immediate\n\
     Perform immediately offline tests\n\
  -q, --quiet-check\n\