From 14cc4daa406fa398f9c89003299a3b94ed471a9d Mon Sep 17 00:00:00 2001 From: hn Date: Sun, 11 Aug 2024 11:54:33 +0200 Subject: [PATCH] Fixes invalid JSON output in file entries. --- src/core/FatSystem.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/FatSystem.cpp b/src/core/FatSystem.cpp index 79cda8c..1ad3928 100644 --- a/src/core/FatSystem.cpp +++ b/src/core/FatSystem.cpp @@ -490,18 +490,21 @@ void FatSystem::list(vector &entries) { vector::iterator it; if(this->_outputFormat == Json){ + bool firstEntry = true; cout << "["; it = entries.begin(); - FatEntry &first = *it; for (; it!=entries.end(); it++) { FatEntry &entry = *it; if (entry.isErased() && !listDeleted) { continue; } - if(&entry != &first) { + + if (!firstEntry) { cout << ","; } + firstEntry = false; + cout << "{\"EntryType\":"; if (entry.isDirectory()) { cout << "\"Directory\","; @@ -535,7 +538,7 @@ void FatSystem::list(vector &entries) else { cout << "\"IsDeleted\":false"; } - cout << "}"; + cout << "}"; fflush(stdout); } cout << "]";