===================================================================
RCS file: /cvs/nagios/check_bioctl/check_bioctl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nagios/check_bioctl/check_bioctl	2011/12/27 01:32:01	1.17
+++ nagios/check_bioctl/check_bioctl	2011/12/27 02:12:38	1.18
@@ -81,7 +81,7 @@
 }
 
 if ($opt_V) {
-    print_revision( $PROGNAME, '$Revision: 1.17 $ ' );
+    print_revision( $PROGNAME, '$Revision: 1.18 $ ' );
     exit $ERRORS{'OK'};
 }
 
@@ -154,38 +154,32 @@
     my $controller;
 
     sub parse_bioctl_line {
-        my ($line) = @_;
-        chomp $line;
+        ($_) = @_;
+        chomp;
 
-        # Do these by columns cuZ that is the easiest for now
-        my @o = unpack( "A10 A1 A11 A15 A7 A9 A*", $line );
+        my @o = map { s/^\s+|\s+$//g; $_ } split;
         return if $o[0] eq 'Volume';
 
-        foreach (@o) {
-            s/^\s+//xms;
-            s/\s+$//xms;
-        }
+        $vid ||= '';
 
-        my ( $c, $id, $status, $size, $dev, $details, $name ) = @o;
-        my $index = $id;
-        if ($c) {
-            $vid        = $id;
-            $controller = $c;
+        my $index = "$vid.$o[0]";
+        if ( $o[0] !~ /^\d+$/ ) {
+            $controller = shift @o;
+            $vid        = $o[0];
+            $index      = $vid;
         }
-        else {
-            $index = "$vid.$id";
-        }
 
         return $index,
             {
-            controller => $controller,
-            id         => $id,
-            status     => $status,
-            size       => $size,
-            device     => $dev,
-            details    => $details,
-            name       => $name,
-            volume_id  => $vid,
+            controller  => $controller,
+            volume_id   => $vid,
+            id          => shift @o,
+            status      => shift @o,
+            size        => shift @o,
+            device      => shift @o,
+            name        => shift @o,
+            description => join ' ',
+            @o,
             };
     }
 }
@@ -223,7 +217,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.17 $' );
+    print_revision( $PROGNAME, '$Revision: 1.18 $' );
 
     print $License;