Skip to content

Commit 8677953

Browse files
committed
add test lines in makefile for unpacking
1 parent 4c7b204 commit 8677953

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ SPIFFS_TEST_FS_CONFIG := -s 0x100000 -p 512 -b 0x2000
8484
test: $(TARGET)
8585
ls -1 spiffs > out.list0
8686
./mkspiffs -c spiffs $(SPIFFS_TEST_FS_CONFIG) out.spiffs | sort | sed s/^\\/// > out.list1
87+
./mkspiffs -u spiffs_u $(SPIFFS_TEST_FS_CONFIG) out.spiffs | sort | sed s/^\\/// > out.list_u
8788
./mkspiffs -l $(SPIFFS_TEST_FS_CONFIG) out.spiffs | cut -f 2 | sort | sed s/^\\/// > out.list2
8889
diff --strip-trailing-cr out.list0 out.list1
8990
diff --strip-trailing-cr out.list0 out.list2
90-
rm -f out.{list0,list1,list2,spiffs}
91+
diff spiffs spiffs_u
92+
rm -f out.{list0,list1,list2,list_u,spiffs}
93+
rm -R spiffs_u

main.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,12 @@ bool dirExists(const char* path)
212212

213213
/**
214214
* @brief Unpack file from file system.
215-
* @param srcName Filename.
215+
* @param spiffsFile SPIFFS dir entry pointer.
216216
* @param destPath Destination file path path.
217217
* @return True or false.
218218
*
219219
* @author Pascal Gollor (http://www.pgollor.de/cms/)
220220
*/
221-
//bool unpackFile(const char *srcName, const char *destPath)
222221
bool unpackFile(spiffs_dirent *spiffsFile, const char *destPath)
223222
{
224223
u8_t buffer[spiffsFile->size];
@@ -237,7 +236,6 @@ bool unpackFile(spiffs_dirent *spiffsFile, const char *destPath)
237236
FILE* dst = fopen(destPath, "wb");
238237

239238
// Write content into file.
240-
//fputs(buffer, dst);
241239
fwrite(buffer, sizeof(u8_t), sizeof(buffer), dst);
242240

243241
// Close file.
@@ -295,13 +293,9 @@ bool unpackFiles(std::string sDest)
295293
// Check if content is a file.
296294
if ((int)(it->type) == 1)
297295
{
298-
//std::string sDestFile = (const char*)(it->name);
299-
//std::string sDestFilePath = sDest + "/" + sDestFile;
300-
//std::string sDestFilePath = sDest + sDestFile;
301296
std::string sDestFilePath = sDest + (const char*)(it->name);
302297

303298
// Unpack file to destination directory.
304-
//if (! unpackFile(sDestFile.c_str(), sDestFilePath.c_str()) )
305299
if (! unpackFile(it, sDestFilePath.c_str()) )
306300
{
307301
std::cout << "Can not unpack " << it->name << "!" << std::endl;

0 commit comments

Comments
 (0)