===================================================================
RCS file: /cvs/nagios/check_openbgpd/check_openbgpd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nagios/check_openbgpd/check_openbgpd	2015/03/26 04:44:15	1.10
+++ nagios/check_openbgpd/check_openbgpd	2024/06/09 23:34:58	1.11
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $AFresh1: check_openbgpd,v 1.9 2015/03/26 03:42:23 andrew Exp $
+# $AFresh1: check_openbgpd,v 1.10 2015/03/26 03:44:15 andrew Exp $
 ########################################################################
 # check_openbgpd *** A nagios check for OpenBSD bgpd
 #
@@ -134,7 +134,11 @@
 sub parse_check {
     my $check = shift;
 
-    return { match => [] } unless $check;
+    unless ($check) {
+        print_help();
+        exit $ERRORS{'OK'}
+    }
+
     my @values = split /,\s*/xms, $check;
 
     my %c = ( match => [] );
@@ -265,21 +269,24 @@
 
         my $opt = shift @argv;
         for ($opt) {
-            when ( '-V' || '--version' ) {
-                print_revision( $PROGNAME, '$Revision: 1.10 $ ' );
+            if ( $_ eq '-V' || $_ eq '--version' ) {
+                print_revision( $PROGNAME, '$Revision: 1.11 $ ' );
                 exit $ERRORS{'OK'}
             }
-            when (/^-?-h(?:elp)?/xms) { print_help(); exit $ERRORS{'OK'} }
-            when (/^-?-s(?:ocket)?/xms) { $checks{_SOCKET} = shift @argv }
-            when (/^-?-w(?:arning)?/xms)  { $w = parse_check( shift @argv ) }
-            when (/^-?-c(?:ritical)?/xms) { $c = parse_check( shift @argv ) }
-            when (/^-?-u(?:nknown)?/xms) {
+            elsif (/^-?-h(?:elp)?\Z/xms) { print_help(); exit $ERRORS{'OK'} }
+            elsif (/^-?-s(?:ocket)?\Z/xms) {
+                $checks{_SOCKET} = shift @argv
+                    || do { print_help(); exit $ERRORS{'OK'} }
+            }
+            elsif (/^-?-w(?:arning)?\Z/xms)  { $w = parse_check( shift @argv ) }
+            elsif (/^-?-c(?:ritical)?\Z/xms) { $c = parse_check( shift @argv ) }
+            elsif (/^-?-u(?:nknown)?\Z/xms) {
                 $checks{_UNKNOWN} = {
                     WARNING  => $w,
                     CRITICAL => $c,
                 };
             }
-            when (/^-?-n(?:eighbor)?/xms) {
+            elsif (/^-?-n(?:eighbor)?\Z/xms) {
                 while ( @argv && $argv[0] !~ /^-/xms ) {
                     $checks{ shift @argv } = {
                         WARNING  => $w,
@@ -287,7 +294,7 @@
                     };
                 }
             }
-            default { print_help(); exit $ERRORS{'UNKNOWN'} }
+            else { print_help(); exit $ERRORS{'UNKNOWN'} }
         }
     }
     return %checks;
@@ -370,7 +377,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.10 $' );
+    print_revision( $PROGNAME, '$Revision: 1.11 $' );
 
     print $LICENSE;