From e4467df4cb4f6edf39092c68cf75ac66f13fae85 Mon Sep 17 00:00:00 2001
From: Michael Mikonos <127171689+mknos@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:43:41 +0800
Subject: [PATCH] cal: deal with warnings

* When temporarily enabling warnings.pm I noticed two patterns which generated a warning
* In get_year(), regex check was done too late after the variable has been treated as a number
* In print_year()/print_year_jd() the month lists being combined might have a less elements; explicitly treat those as empty string
---
 bin/cal | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/cal b/bin/cal
index 9e4a09bf..a241bc08 100755
--- a/bin/cal
+++ b/bin/cal
@@ -80,6 +80,8 @@ sub print_year_jd {
 		my @m1 = fmt_month($cal::year, $mon[1], 0);
 
 		foreach my $i (0 .. 7) {
+			$m0[$i] = '' unless defined $m0[$i];
+			$m1[$i] = '' unless defined $m1[$i];
 			printf "%-${w}s %-${w}s\n", $m0[$i], $m1[$i];
 		}
 	}
@@ -95,6 +97,9 @@ sub print_year {
 		my @m2 = fmt_month($cal::year, $mon[2], 0);
 
 		foreach my $i (0 .. 7) {
+			$m0[$i] = '' unless defined $m0[$i];
+			$m1[$i] = '' unless defined $m1[$i];
+			$m2[$i] = '' unless defined $m2[$i];
 			printf "%-${w}s %-${w}s %-${w}s\n", $m0[$i], $m1[$i], $m2[$i];
 		}
 	}
@@ -249,7 +254,7 @@ sub get_month {
 
 sub get_year {
 	my( $year ) = @_;
-	if( $year < 1 || $year > 9999 || $year !~ /^\d+$/o ) {
+	if ($year !~ m/\A[0-9]+\z/ ||  $year < 1 || $year > 9999) {
 		print "INVALID YEAR ENTERED.\n";
 		display_help();
 	}