From 6772292a527c232fe550254eb5503074758f7737 Mon Sep 17 00:00:00 2001
From: Leeland Heins <softwarejanitor@yahoo.com>
Date: Wed, 27 Feb 2019 12:34:55 -0600
Subject: [PATCH] Bug fixes for proread.pl

---
 ProDOS.pm  | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 README     |  2 +-
 proread.pl |  9 ++++++---
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/ProDOS.pm b/ProDOS.pm
index ff6f3a1..8ff01f9 100644
--- a/ProDOS.pm
+++ b/ProDOS.pm
@@ -708,8 +708,8 @@ sub parse_subdir_hdr_blk {
   for (my $i = 0; $i < 12; $i++) {
     my $storage_type_name_length = shift @flds;
     my $storage_type = ($storage_type_name_length & 0xf0) >> 4;
-    print sprintf("storage_type_name_length=%02x\n", $storage_type_name_length);
-    print sprintf("storage_type=%02x\n", $storage_type);
+    print sprintf("storage_type_name_length=%02x\n", $storage_type_name_length) if $debug;
+    print sprintf("storage_type=%02x\n", $storage_type) if $debug;
     my $name_length = $storage_type_name_length & 0x0f;
     print sprintf("name_length=%02x\n", $name_length) if $debug;
     my $file_name = shift @flds;
@@ -885,12 +885,12 @@ sub get_ind_blk {
 
   if (read_blk($pofile, $ind_blk, \$buf)) {
     dump_blk($buf) if $debug;
-    my (@lo) = unpack "C256", $buf;
+    my @lo = unpack "C256", $buf;
     #foreach my $byte (@lo) {
     #  print sprintf("%02x ", $byte);
     #}
     #print "\n";
-    my (@hi) = unpack "x256C256", $buf;
+    my @hi = unpack "x256C256", $buf;
     #foreach my $byte (@hi) {
     #  print sprintf("%02x ", $byte);
     #}
@@ -901,6 +901,14 @@ sub get_ind_blk {
       #print sprintf("blk=%04x\n", $blk);
       push @blocks, $blk;
     }
+    #print "blocks=\n";
+    #my $x = 0;
+    #foreach my $block (@blocks) {
+    #  printf("%04x ", $block);
+    #  $x++;
+    #  print "\n" if !($x % 16);
+    #}
+    #print "\n";
   }
 
   return @blocks;
@@ -969,7 +977,7 @@ sub find_file {
 # Read a file
 #
 sub read_file {
-  my ($pofile, $filename, $mode, $conv, $dbg) = @_;
+  my ($pofile, $filename, $mode, $conv, $output_file, $dbg) = @_;
 
   $debug = 1 if defined $dbg && $dbg;
 
@@ -981,6 +989,16 @@ sub read_file {
 
   my $buf;
 
+  my $ofh;
+
+  if (! defined $output_file || $output_file eq '') {
+    $ofh = \*STDOUT;
+  } else {
+    if (!open($ofh, ">$output_file")) {
+      return 0;
+    }
+  }
+
   print "storage_type=$storage_type file_type=$file_type key_pointer=$key_pointer blocks_used=$blocks_used\n" if $debug;
 
   # Seedling file, only 1 block
@@ -1015,6 +1033,8 @@ sub read_file {
       if (read_blk($pofile, $blk, \$buf2)) {
         dump_blk($buf2) if $debug;
         my @bytes = unpack "C*", $buf2;
+        #my $x = 0;
+        #print "bytes=\n";
         foreach my $byte (@bytes) {
           # For text file translation.
           last if $byte == 0x00 && $mode eq 'T';
@@ -1023,8 +1043,15 @@ sub read_file {
           # Convert Apple II ASCII to standard ASCII (clear high bit)
           $byte &= 0x7f if $mode eq 'T';
           #print sprintf("%c", $byte & 0x7f);
-          print sprintf("%c", $byte);
+          #print sprintf("%c", $byte);
+          #print $ofh ord($byte);
+          print $ofh sprintf("%c", $byte);
+          #$x++;
+          #printf("%02x ", $byte);
+          #print "\n" if !($x % 16);
         }
+        #print "\n";
+        #print "Wrote $x bytes\n";
       }
       last if $blkno++ == $blocks_used - 1;
     }
@@ -1035,6 +1062,8 @@ sub read_file {
   } else {
     print "Not a regular file!\n";
   }
+
+  return 1;
 }
 
 #
@@ -1110,7 +1139,7 @@ sub freemap {
 
   my (@blocks) = get_vol_bit_map($pofile, $debug);
 
-  print "    12345678\n";
+  print "    01234567\n";
   print "   +--------\n";
 
   my $trk = 0;
@@ -1123,5 +1152,11 @@ sub freemap {
   print "\n";
 }
 
+#
+# Write a file
+#
+sub wriet_file {
+}
+
 1;
 
diff --git a/README b/README
index 2f452cc..318d1f5 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ prozap.pl -- partially working
 procat.pl -- partially working
 profree.pl -- partially working
 proread.pl -- partially working
-prowrite.pl
+prowrite.pl -- started
 prorename.pl
 prodelete.pl
 procopy.pl
diff --git a/proread.pl b/proread.pl
index 28dba1c..614c62e 100644
--- a/proread.pl
+++ b/proread.pl
@@ -12,8 +12,10 @@ use strict;
 
 use ProDOS;
 
-my $mode = 'T';  # T=Text
-my $conv = 1;  # Convert \r to \n
+#my $mode = 'T';  # T=Text
+my $mode = 'B';  # B=Binary
+#my $conv = 1;  # Convert \r to \n
+my $conv = 0;  # Don't convert \r to \n
 my $debug = 0;
 
 while (defined $ARGV[0] && $ARGV[0] =~ /^-/) {
@@ -59,8 +61,9 @@ while (defined $ARGV[0] && $ARGV[0] =~ /^-/) {
 
 my $pofile = shift or die "Must supply .po filename\n";
 my $filename = shift or die "Must supply filename (on disk image)\n";
+my $output_file = shift;
 
-read_file($pofile, $filename, $mode, $conv, $debug);
+read_file($pofile, $filename, $mode, $conv, $output_file, $debug);
 
 1;