From 1a27d76d67f3ffae727d61abaab9f89e369a60ae Mon Sep 17 00:00:00 2001
From: ksherlock <ksherlock@aa027e90-d47c-11dd-86d7-074df07e0730>
Date: Wed, 19 May 2010 20:06:11 +0000
Subject: [PATCH] git-svn-id:
 https://profuse.googlecode.com/svn/branches/v2@227
 aa027e90-d47c-11dd-86d7-074df07e0730

---
 Pascal/FileEntry.cpp |  2 +-
 apfm.cpp             | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Pascal/FileEntry.cpp b/Pascal/FileEntry.cpp
index f12cb72..23ba327 100644
--- a/Pascal/FileEntry.cpp
+++ b/Pascal/FileEntry.cpp
@@ -220,7 +220,7 @@ int FileEntry::textRead(uint8_t *buffer, unsigned size, unsigned offset)
         to += pageSize;
     }
     
-
+    // first 2 pages are spare, for editor use, not actually text.
     block = _firstBlock + 2 + (page * 2);
     
     
diff --git a/apfm.cpp b/apfm.cpp
index c21d049..dbefc63 100644
--- a/apfm.cpp
+++ b/apfm.cpp
@@ -188,7 +188,7 @@ int action_cat(unsigned argc, char **argv, Pascal::VolumeEntry *volume)
         return 1;
     }
 
-    for (unsigned i = 0; i < argc; ++i)
+    for (unsigned i = 1; i < argc; ++i)
     {
         const char *fname = argv[i];
         unsigned fileSize;
@@ -270,7 +270,7 @@ void usage()
 
 }
 
-int main(/* int argc, char **argv */)
+int main(int argc, char **argv)
 {
     std::auto_ptr<Pascal::VolumeEntry> volume;
     std::auto_ptr<Device::BlockDevice> device;
@@ -280,7 +280,18 @@ int main(/* int argc, char **argv */)
     int c;
     
 
-    
+    /*
+    char *argv2[] = {
+        (char *)"afpm",
+        //(char *)"/Users/kelvin/Desktop/ucsd/pascal.dsk",
+        (char *)"/Users/kelvin/Desktop/ucsd/UCSD Pascal 1.2_3.DSK",
+        (char *)"cat",
+        (char *)"SPIRODEMO.TEXT",
+        NULL
+    };
+    char **argv = argv2;
+    int argc = 4;
+    */
 
     // getop stops at first non '-' arg so it will not affect action flags.    
     while ((c = ::getopt(argc, argv, "f:h")) != -1)