From a43a529fe75abe9c4944c8392256c829a399b837 Mon Sep 17 00:00:00 2001
From: Stephen Crane <jscrane@gmail.com>
Date: Fri, 16 Nov 2018 12:35:07 +0000
Subject: [PATCH] minor fixes

---
 sdtape.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sdtape.cpp b/sdtape.cpp
index f4c6568..e190d63 100644
--- a/sdtape.cpp
+++ b/sdtape.cpp
@@ -22,10 +22,15 @@ static Dir dir;
 
 #define STORAGE defined(USE_SD) || defined(USE_SPIFFS) || defined(USE_FS)
 
+#if defined(USE_FS)
+static const char *programs;
+#endif
+
 bool sdtape::start(const char *programs)
 {
 #if defined(USE_FS)
-	dir = SPIFFS.openDir("/");
+	::programs = programs;
+	dir = SPIFFS.openDir(programs);
 #elif defined(DISK)
 	dir = DISK.open(programs);
 	if (!dir)
@@ -45,15 +50,14 @@ void sdtape::stop()
 
 bool sdtape::more()
 {
-#if defined(STORAGE)
 	if (_pos >= _len) {
 		_pos = 0;
+#if defined(STORAGE)
 		_len = file.read(_buf, sizeof(_buf));
-
+#endif
 		if (_len == 0)	// eof
 			return false;
 	}
-#endif
 	return true;
 }
 
@@ -68,7 +72,7 @@ const char *sdtape::advance() {
 			file = dir.openFile("r");
 			break;
 		}
-		dir = SPIFFS.openDir("/");
+		dir = SPIFFS.openDir(programs);
 	}
 	strncpy(buf, dir.fileName().c_str(), sizeof(buf));
 	return buf;