From ab5bd71d7b6a9dfead36e0667e742b9d7396fb8a Mon Sep 17 00:00:00 2001
From: Michaelangel007 <michaelangel007@sharedcraft.com>
Date: Fri, 29 Dec 2017 09:26:27 -0800
Subject: [PATCH] Cleanup doCopy()

---
 prodos.cpp | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/prodos.cpp b/prodos.cpp
index cd84e72..b448050 100644
--- a/prodos.cpp
+++ b/prodos.cpp
@@ -396,17 +396,49 @@ bool doCopy( ProDOS_FileHeader_t *entry, const char *filename )
         nExtLen = nLen;
     }
 
+    const char *pBaseName = filename + nSrcLen;
+    size_t      nBaseLen  = 0;
+
+    // Chop off preceeding directory if there is one
+    if( pBaseName )
+    {
+        while( pBaseName > filename )
+        {
+            if( *pBaseName == '/' )
+                break;
+
+            pBaseName--;
+            nBaseLen ++;
+        }
+    }
+
+#if DEBUG_MAIN
+    printf( "----------\n" );
+    printf( "Extension: %d\n", pExt != NULL );
+    printf( "+ %s\n"     , pSrcFileName );
+    printf( "  Len: %u\n", nSrcLen      );
+    printf( " Base: %s\n", pBaseName    );
+    printf( "  Len: %u\n", nBaseLen     );
+    printf( "----------\n" );
+#endif
+
     if( nSrcLen > 15 )
     {
+        nBaseLen  = nSrcLen - nExtLen;
+
         // Chop off part of name until it fits
+        {
+            pBaseName++;
+            nBaseLen --;
+        }
 
         // If we have an extension, chop the prefix preserving extension
         // If no extension, chop the prefix
         if( pExt )
         {
             int end  = nSrcLen - 4;
-            int len1 = string_CopyUpper( gEntry.name +   0, pSrcFileName, end );
-            int len2 = string_CopyUpper( gEntry.name + end, pExt              );
+            int len1 = string_CopyUpper( gEntry.name +   0, pBaseName, nBaseLen );
+            int len2 = string_CopyUpper( gEntry.name + end, pExt                );
 
             gEntry.len = len1 + len2;
             bCopiedName = true;