fix esp8266#5246 - also add optional SPIFFS.begin(false): will not try to format (default is true)

Author: d-a-v

cores/esp8266/spiffs_api.cpp

@@ -110,16 +110,6 @@ bool isSpiffsFilenameValid(const char* name)
 
 // these symbols should be defined in the linker script for each flash layout
 #ifdef ARDUINO
-extern "C" uint32_t _SPIFFS_start;
-extern "C" uint32_t _SPIFFS_end;
-extern "C" uint32_t _SPIFFS_page;
-extern "C" uint32_t _SPIFFS_block;
-
-#define SPIFFS_PHYS_ADDR ((uint32_t) (&_SPIFFS_start) - 0x40200000)
-#define SPIFFS_PHYS_SIZE ((uint32_t) (&_SPIFFS_end) - (uint32_t) (&_SPIFFS_start))
-#define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
-#define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)
-
 #ifndef SPIFFS_MAX_OPEN_FILES
 #define SPIFFS_MAX_OPEN_FILES 5
 #endif

cores/esp8266/spiffs_api.h

@@ -35,6 +35,16 @@
 
 using namespace fs;
 
+extern "C" uint32_t _SPIFFS_start;
+extern "C" uint32_t _SPIFFS_end;
+extern "C" uint32_t _SPIFFS_page;
+extern "C" uint32_t _SPIFFS_block;
+
+#define SPIFFS_PHYS_ADDR ((uint32_t) (&_SPIFFS_start) - 0x40200000)
+#define SPIFFS_PHYS_SIZE ((uint32_t) (&_SPIFFS_end) - (uint32_t) (&_SPIFFS_start))
+#define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
+#define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)
+
 extern int32_t spiffs_hal_write(uint32_t addr, uint32_t size, uint8_t *src);
 extern int32_t spiffs_hal_erase(uint32_t addr, uint32_t size);
 extern int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst);
@@ -114,6 +124,14 @@ class SPIFFSImpl : public FSImpl
 
     bool begin() override
     {
+        return begin(true);
+    }
+
+    bool begin(bool autoformat)
+    {
+        if (_SPIFFS_start <= _SPIFFS_end)
+            return false;
+
         if (SPIFFS_mounted(&_fs) != 0) {
             return true;
         }
@@ -124,6 +142,9 @@ class SPIFFSImpl : public FSImpl
         if (_tryMount()) {
             return true;
         }
+        if (!autoformat) {
+            return false;
+        }
         auto rc = SPIFFS_format(&_fs);
         if (rc != SPIFFS_OK) {
             DEBUGV("SPIFFS_format: rc=%d, err=%d\r\n", rc, _fs.err_code);