From aeba0d32bd8aae42a79a85c5a4ed5c366e89b8e5 Mon Sep 17 00:00:00 2001
From: Leeland Heins <softwarejanitor@yahoo.com>
Date: Mon, 14 Jan 2019 14:21:20 -0600
Subject: [PATCH] Bug fixes

---
 ProDOS.pm | 48 +++++++++++-------------------------------------
 procat.pl | 51 ---------------------------------------------------
 2 files changed, 11 insertions(+), 88 deletions(-)

diff --git a/ProDOS.pm b/ProDOS.pm
index c2ba645..d89e171 100644
--- a/ProDOS.pm
+++ b/ProDOS.pm
@@ -168,49 +168,24 @@ for (my $i = 0; $i < 12; $i++) {
 sub date_convert {
   my ($ymd, $hm) = @_;
 
-  #my $cr1 = unpack "b16", hex($ymd);
-
-  #print "cr1=$cr1\n";
-
-  #my $yy = substr($cr1, 0, 7);
-  #print "yy=$yy\n";
-  #my $year = oct('0b' . $yy);
-  #print "year=$year\n";
-  #my $mm = substr($cr1, 7, 4);
-  #print "mm=$mm\n";
-  #my $mon = oct('0b' . $mm);
-  #print "mon=$mon\n";
-  #my $dd = substr($cr1, 11, 5);
-  #print "dd=$dd\n";
-  #my $day = oct('0b' . $dd);
-  #print "day=$day\n";
-
-  #my $cr2 = unpack "B16", $hm;
-
-  #print "cr2=$cr2\n";
-
-  #my $hh = substr($cr2, 3, 5);
-  #my $hour = oct('0b' . $hh);
-  #print "hour=$hour\n";
-  #my $mm = substr($cr2, 10, 6);
-  #my $min = oct('0b' . $mm);
-  #print "min=$min\n";
+  return "<NO DATE>" unless (defined $ymd && defined $hm && $ymd != 0);
 
   my $year = ($ymd & 0xfe00) >> 9;  # bits 9-15
-  my $mon = (($ymd & 0x01e0) >> 5) - 1;  # bits 5-8
+  #print "year=$year\n";
+  my $mon = (($ymd & 0x01e0) >> 5 - 1);  # bits 5-8
+  $mon++;
+  #print "mon=$mon\n";
   my $day = $ymd & 0x001f;  # bits 0-4
+  #print "day=$day\n";
   my $hour = ($hm & 0x1f00) >> 8;  # bits 8-12
+  #print "hour=$hour\n";
   my $min = $hm & 0x003f;  # bits 0-5
+  #print "min=$min\n";
+  $mon = 0 if $mon > 12;
 
-  return "<NO DATE>" if $day < 1;
+  return "<NO DATE>" if $mon < 1;
 
-  #$year += 1970;
-  $mon = 1 if $mon < 1;
-  $day = 1 if $day < 1;
-  #$year += 2000 if ($year < 50);
-  #$year += 1900 if ($year < 100);
-
-  return sprintf("%-2d-%s-%02d %2d:%02d", $day, $months{$mon}, $year, $hour, $min);
+  return sprintf("%2d-%s-%02d %2d:%02d", $day, $months{$mon}, $year, $hour, $min);
 }
 
 # Parse Key Volume Directory Block
@@ -452,7 +427,6 @@ sub cat {
   my $vol_dir_blk = $nxt_vol_dir_blk;
 
   while ($vol_dir_blk) {
-    #my ($prv_vol_dir_blk, $nxt_vol_dir_blk, $storage_type_name_length, $volume_name, $creation_ymd, $creation_hm, $version, $min_version, $access, $entry_length, $entries_per_block, $file_count, $bit_map_pointer, $total_blocks, @files) = get_vol_dir_blk($pofile, $vol_dir_blk, $debug);
     my ($prv_vol_dir_blk, $nxt_vol_dir_blk, @files) = get_vol_dir_blk($pofile, $vol_dir_blk, $debug);
     foreach my $file (@files) {
       my $lck = ' ';
diff --git a/procat.pl b/procat.pl
index d6010cc..0162ca9 100644
--- a/procat.pl
+++ b/procat.pl
@@ -21,57 +21,6 @@ while (defined $ARGV[0] && $ARGV[0] =~ /^-/) {
 
 my $pofile = shift or die "Must supply filename\n";
 
-#my $buf;
-
-#if (read_blk($pofile, $blk, \$buf)) {
-#  dump_blk($buf);
-
-  #my @bytes = unpack "C512", $buf;
-
-  #$bytes[8] = ord('H');
-  #$bytes[9] = ord('E');
-  #$bytes[10] = ord('L');
-  #$bytes[11] = ord('L');
-  #$bytes[12] = ord('O');
-  #$bytes[13] = ord('!');
-
-  #my $buf = pack "C*", @bytes;
-
-  #if (write_blk($pofile, $blk, $buf)) {
-  #  if (read_blk($pofile, $blk, \$buf)) {
-  #    dump_blk($buf);
-  #  } else {
-  #    print "Failed final read!\n";
-  #  }
-  #} else {
-  #  print "Failed write!\n";
-  #}
-#} else {
-#  print "Failed initial read!\n";
-#}
-
-
-#my ($prv_vol_dir_blk, $nxt_vol_dir_blk, $storage_type_name_length, $volume_name, $creation_ymd, $creation_hm, $version, $min_version, $access, $entry_length, $entries_per_block, $file_count, $bit_map_pointer, $total_blocks, @files) = get_key_vol_dir_blk($pofile, $debug);
-
-#print "/$volume_name\n\n";
-
-#print " NAME           TYPE  BLOCKS  MODIFIED         CREATED          ENDFILE SUBTYPE\n\n";
-
-#foreach my $file (@files) {
-#  print sprintf(" %-15s %3s %7d %16s %16s  %7s %s\n", $file->{'filename'}, $file->{'ftype'}, $file->{'used'}, $file->{'mdate'}, $file->{'cdate'}, '', $file->{'atype'});
-#}
-
-#my $vol_dir_blk = $nxt_vol_dir_blk;
-
-#while ($vol_dir_blk) {
-#  #my ($prv_vol_dir_blk, $nxt_vol_dir_blk, $storage_type_name_length, $volume_name, $creation_ymd, $creation_hm, $version, $min_version, $access, $entry_length, $entries_per_block, $file_count, $bit_map_pointer, $total_blocks, @files) = get_vol_dir_blk($pofile, $vol_dir_blk, $debug);
-#  my ($prv_vol_dir_blk, $nxt_vol_dir_blk, @files) = get_vol_dir_blk($pofile, $vol_dir_blk, $debug);
-#  foreach my $file (@files) {
-#    print sprintf(" %-15s %3s %7d %16s %16s  %7s %s\n", $file->{'filename'}, $file->{'ftype'}, $file->{'used'}, $file->{'mdate'}, $file->{'cdate'}, '', $file->{'atype'});
-#  }
-#  $vol_dir_blk = $nxt_vol_dir_blk;
-#}
-
 cat($pofile, $debug);
 
 1;