check_tcp code cleanup from andreas plus fix to andreas' patch from sean

[nagiosplug.git] / plugins / check_ide_smart.c

diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 6487d0859bfb7a8b3603e0a42fec0ed6e4879619..4172483905899e4bd376a2af846576fd46adce38 100644 (file)
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -6,9 +6,9 @@
  *
  *  Notes:
  *        ide-smart has the same functionality as before. Some return
- *        values were changed, otherwise the --net-saint option was added.
+ *        values were changed, otherwise the --nagios option was added.
  *
- *        Run with:  check_ide-smart --net-saint [-d] <DRIVE>
+ *        Run with:  check_ide-smart --nagios [-d] <DRIVE>
  *        Where DRIVE is an IDE drive, ie. /dev/hda, /dev/hdb, /dev/hdc
  *
  *          - Returns 0 on no errors
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
                {"quiet-check", no_argument, 0, 'q'}, 
                {"auto-on", no_argument, 0, '1'}, 
                {"auto-off", no_argument, 0, '0'}, 
-               {"net-saint", no_argument, 0, 'n'}, 
+               {"nagios", no_argument, 0, 'n'}, 
                {"help", no_argument, 0, 'h'}, 
                {"version", no_argument, 0, 'V'}, {0, 0, 0, 0} 
        };
@@ -181,8 +181,8 @@ main (int argc, char *argv[])
        while (1) {
                
                o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex);
-               
-               if (o == -1 || o == EOF)
+
+               if (o == -1 || o == EOF || o == 1)
                        break;
 
                switch (o) {
@@ -213,57 +213,56 @@ main (int argc, char *argv[])
                default:
                        usage2 (_("Unknown argument"), optarg);
                }
+       }
 
-               if (optind < argc) {
-                       device = argv[optind];
-               }
+       if (optind < argc) {
+               device = argv[optind];
+       }
 
-               if (!device) {
-                       show_help ();
-                       show_version ();
-                       return -1;
-               }
+       if (!device) {
+               print_help ();
+               return STATE_OK;
+       }
 
-               fd = open (device, O_RDONLY);
+       fd = open (device, O_RDONLY);
 
-               if (fd < 0) {
-                       printf (_("CRITICAL - Couldn't open device: %s\n"), strerror (errno));
-                       return 2;
-               }
+       if (fd < 0) {
+               printf (_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror (errno));
+               return STATE_CRITICAL;
+       }
 
-               if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, TRUE)) {
-                       printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
-                       return 2;
-               }
+       if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, TRUE)) {
+               printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
+               return STATE_CRITICAL;
+       }
 
-               switch (command) {
-               case 0:
-                       retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0, TRUE);
-                       break;
-               case 1:
-                       retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0xF8, TRUE);
-                       break;
-               case 2:
-                       retval = smart_cmd_simple (fd, SMART_CMD_IMMEDIATE_OFFLINE, 0, TRUE);
-                       break;
-               case 3:
-                       smart_read_values (fd, &values);
-                       smart_read_thresholds (fd, &thresholds);
-                       retval = values_not_passed (&values, &thresholds);
-                       break;
-               case 4:
-                       smart_read_values (fd, &values);
-                       smart_read_thresholds (fd, &thresholds);
-                       retval = nagios (&values, &thresholds);
-                       break;
-               default:
-                       smart_read_values (fd, &values);
-                       smart_read_thresholds (fd, &thresholds);
-                       print_values (&values, &thresholds);
-                       break;
-               }
-               close (fd);
+       switch (command) {
+       case 0:
+               retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0, TRUE);
+               break;
+       case 1:
+               retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0xF8, TRUE);
+               break;
+       case 2:
+               retval = smart_cmd_simple (fd, SMART_CMD_IMMEDIATE_OFFLINE, 0, TRUE);
+               break;
+       case 3:
+               smart_read_values (fd, &values);
+               smart_read_thresholds (fd, &thresholds);
+               retval = values_not_passed (&values, &thresholds);
+               break;
+       case 4:
+               smart_read_values (fd, &values);
+               smart_read_thresholds (fd, &thresholds);
+               retval = nagios (&values, &thresholds);
+               break;
+       default:
+               smart_read_values (fd, &values);
+               smart_read_thresholds (fd, &thresholds);
+               print_values (&values, &thresholds);
+               break;
        }
+       close (fd);
        return retval;
 }
 
@@ -368,6 +367,7 @@ nagios (values_t * p, thresholds_t * t)
                        prefailure > 1 ? 's' : ' ',
                        failed,
                  total);
+               status=STATE_CRITICAL;
                break;
        case ADVISORY:
                printf (_("WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"),
@@ -375,14 +375,16 @@ nagios (values_t * p, thresholds_t * t)
                        advisory > 1 ? "ies" : "y",
                        failed,
                        total);
+               status=STATE_WARNING;
                break;
        case OPERATIONAL:
                printf (_("OK - Operational (%d/%d tests passed)\n"), passed, total);
+               status=STATE_OK;
                break;
        default:
-               printf (_("ERROR - Status '%d' uknown. %d/%d tests passed\n"), status,
+               printf (_("ERROR - Status '%d' unkown. %d/%d tests passed\n"), status,
                                                passed, total);
-               status = -1;
+               status = STATE_UNKNOWN;
                break;
        }
        return status;
@@ -498,11 +500,14 @@ print_help (void)
        printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
        printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
        printf (COPYRIGHT, copyright, email);
+
+       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\