Merge pull request #2224 from mikee47/fix/ifs-attributes

Fix IFS attribute handling and other improvements

Sming/Arch/Esp32/app.mk

@@ -11,7 +11,7 @@ LDFLAGS	+= \
 
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(TARGET_BIN)
+application: $(TARGET_BIN)
 
 # $1 -> Linker script
 define LinkTarget

Sming/Arch/Esp8266/app.mk

@@ -35,7 +35,7 @@ LDFLAGS	+= \
 
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(FW_FILE_1) $(FW_FILE_2)
+application: $(FW_FILE_1) $(FW_FILE_2)
 
 # $1 -> Linker script
 define LinkTarget

Sming/Arch/Host/Components/spi_flash/flashmem.cpp

@@ -21,12 +21,11 @@
 #include "flashmem.h"
 #include <string.h>
 #include <esp_spi_flash.h>
-#include <IFS/Host/FileSystem.h>
+#include <IFS/File.h>
 
 namespace
 {
-IFS::IFileSystem& fileSys{IFS::Host::fileSystem};
-IFS::File::Handle flashFile{-1};
+IFS::File flashFile(&IFS::Host::getFileSystem());
 size_t flashFileSize{0x400000U};
 char flashFileName[256];
 const char defaultFlashFileName[]{"flash.bin"};
@@ -59,26 +58,24 @@ bool host_flashmem_init(FlashmemConfig& config)
 		config.filename = flashFileName;
 	}
 
-	flashFile = fileSys.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite);
-	if(flashFile < 0) {
+	if(!flashFile.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite)) {
 		hostmsg("Error opening \"%s\"", flashFileName);
 		return false;
 	}
 
-	int res = fileSys.lseek(flashFile, 0, SeekOrigin::End);
+	int res = flashFile.seek(0, SeekOrigin::End);
 	if(res < 0) {
-		hostmsg("Error seeking \"%s\": %s", flashFileName, fileSys.getErrorString(res).c_str());
-		fileSys.close(flashFile);
-		flashFile = -1;
+		hostmsg("Error seeking \"%s\": %s", flashFileName, flashFile.getErrorString(res).c_str());
+		flashFile.close();
 		return false;
 	}
 
 	if(res == 0) {
 		size_t size = config.createSize ?: flashFileSize;
-		res = fileSys.lseek(flashFile, size, SeekOrigin::Start);
+		res = flashFile.seek(size, SeekOrigin::Start);
 		if(res != int(size)) {
 			hostmsg("Error seeking beyond end of file \"%s\"", flashFileName);
-		} else if(fileSys.truncate(flashFile, size) < 0) {
+		} else if(!flashFile.truncate(size)) {
 			hostmsg("Error truncating \"%s\" to %u bytes", flashFileName, size);
 		} else {
 			hostmsg("Created blank \"%s\", %u bytes", flashFileName, size);
@@ -95,37 +92,36 @@ bool host_flashmem_init(FlashmemConfig& config)
 
 void host_flashmem_cleanup()
 {
-	fileSys.close(flashFile);
-	flashFile = -1;
+	flashFile.close();
 	hostmsg("Closed \"%s\"", flashFileName);
 }
 
 static int readFlashFile(uint32_t offset, void* buffer, size_t count)
 {
-	if(flashFile < 0) {
+	if(!flashFile) {
 		return -1;
 	}
-	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	int res = flashFile.seek(offset, SeekOrigin::Start);
 	if(res >= 0) {
-		res = fileSys.read(flashFile, buffer, count);
+		res = flashFile.read(buffer, count);
 	}
 	if(res < 0) {
-		debug_w("readFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+		debug_w("readFlashFile(0x%08x, %u) failed: %s", offset, count, flashFile.getErrorString(res).c_str());
 	}
 	return res;
 }
 
 static int writeFlashFile(uint32_t offset, const void* data, size_t count)
 {
-	if(flashFile < 0) {
+	if(!flashFile) {
 		return -1;
 	}
-	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	int res = flashFile.seek(offset, SeekOrigin::Start);
 	if(res >= 0) {
-		res = fileSys.write(flashFile, data, count);
+		res = flashFile.write(data, count);
 	}
 	if(res < 0) {
-		debug_w("writeFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+		debug_w("writeFlashFile(0x%08x, %u) failed: %s", offset, count, flashFile.getErrorString(res).c_str());
 	}
 	return res;
 }

Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp

@@ -9,8 +9,7 @@
  ****/
 
 #include "HostFileStream.h"
-#include <IFS/Host/FileSystem.h>
 
-HostFileStream::HostFileStream() : IFS::FileStream(&IFS::Host::fileSystem)
+HostFileStream::HostFileStream() : IFS::FileStream(&IFS::Host::getFileSystem())
 {
 }

Sming/Arch/Host/Core/Data/Stream/HostFileStream.h

@@ -21,7 +21,7 @@ class HostFileStream : public IFS::FileStream
 public:
 	HostFileStream();
 
-	HostFileStream(const String& fileName, IFS::File::OpenFlags openFlags = IFS::File::ReadOnly) : HostFileStream()
+	HostFileStream(const String& fileName, IFS::OpenFlags openFlags = IFS::OpenFlag::Read) : HostFileStream()
 	{
 		open(fileName, openFlags);
 	}

Sming/Arch/Host/app.mk

@@ -15,7 +15,7 @@ TARGET_OUT_0			:= $(FW_BASE)/$(APP_NAME)$(TOOL_EXT)
 # Target definitions
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(TARGET_OUT_0)
+application: $(TARGET_OUT_0)
 
 $(TARGET_OUT_0): $(COMPONENTS_AR)
 	$(info $(notdir $(PROJECT_DIR)): Linking $@)

Sming/Arch/Host/build.mk

@@ -21,7 +21,8 @@ GCC_UPGRADE_URL := https://sming.readthedocs.io/en/latest/arch/host/host-emulato
 
 CPPFLAGS += \
 	-m32 \
-	-Wno-deprecated-declarations
+	-Wno-deprecated-declarations \
+	-D_FILE_OFFSET_BITS=64
 
 # => Tools
 MEMANALYZER = size
@@ -33,6 +34,9 @@ CLI_TARGET_OPTIONS =
 # $1 -> Command to execute
 ifeq ($(UNAME),Windows)
 DetachCommand = start $1
+# May be required by some applications (e.g. openssl)
+HOME ?= $(USERPROFILE)
+export HOME
 else
 DetachCommand = gnome-terminal -- bash -c "sleep 1; $1"
 endif

Sming/Components/spiffs/spiffsgen.py

@@ -228,9 +228,10 @@ def to_binary(self):
                 magic = 0xE3457A77
                 mtime = self.mtime
                 attr = 0
-                flags = 0xff
                 userRole_admin = 0x04
-                meta = struct.pack(b'<LLBBBB', magic, mtime, attr, flags, userRole_admin, userRole_admin)
+                compression_none = 0
+                original_size = 0
+                meta = struct.pack(b'<LLBBBBB', magic, mtime, attr, userRole_admin, userRole_admin, compression_none, original_size)
                 meta += b'\x00' * (self.build_config.meta_len - 12)
             else:
                 meta = b'\00' * self.build_config.meta_len