fix esp8266/rp2040 compilation errors

Author: tobozo

src/ESP32-targz-lib.hpp

@@ -227,13 +227,6 @@ __attribute__((unused)) static uint64_t targzTotalBytesFn() {
 
 #define FOLDER_SEPARATOR "/"
 
-#ifndef FILE_READ
-  #define FILE_READ "r"
-#endif
-#ifndef FILE_WRITE
-  #define FILE_WRITE "w+"
-#endif
-
 #ifndef SPI_FLASH_SEC_SIZE
   #define SPI_FLASH_SEC_SIZE 4096
 #endif

src/libpacker/LibPacker.cpp

@@ -551,7 +551,7 @@ namespace LZPacker
     log_d("Stream to file (source=%d bytes)", srcLen);
     if( !srcStream || srcLen>0 || !dstFS || !dstFilename)
       return 0;
-    fs_File dstFile = dstFS->open(dstFilename, FILE_WRITE);
+    fs_File dstFile = dstFS->open(dstFilename, fs_file_write);
     if( !dstFile )
       return 0;
     auto ret = LZPacker::compress(srcStream, srcLen, &dstFile);
@@ -565,7 +565,7 @@ namespace LZPacker
   {
     if( !srcFS || !srcFilename || !dstFS || !dstFilename)
       return 0;
-    fs_File srcFile = srcFS->open(srcFilename, FILE_READ);
+    fs_File srcFile = srcFS->open(srcFilename, fs_file_read);
     if(!srcFile)
       return 0;
     auto ret = LZPacker::compress( &srcFile, srcFile.size(), dstFS, dstFilename);
@@ -579,7 +579,7 @@ namespace LZPacker
   {
     if( !srcFS || !srcFilename || !dstStream)
       return 0;
-    fs_File srcFile = srcFS->open(srcFilename, FILE_READ);
+    fs_File srcFile = srcFS->open(srcFilename, fs_file_read);
     if(!srcFile)
       return 0;
     log_d("File to stream (source=%d bytes)", srcFile.size());
@@ -666,15 +666,15 @@ namespace TarPacker
       log_v("io::open(%s, mode=%s)", filename, mode);
       if( String(mode) == "r" ) {
         flagStr = "r";
-        fileRO = fs->open(filename, FILE_READ);
+        fileRO = fs->open(filename, fs_file_read);
         if(!fileRO) {
           log_e("Unable to open %s for reading", filename);
           return (void*)-1;
         }
         retPtr = &fileRO;
       } else {
         flagStr = "w";
-        fileRW = fs->open(filename, FILE_WRITE);
+        fileRW = fs->open(filename, fs_file_write);
         if(!fileRW) {
           log_e("Unable to open %s for writing", filename);
           return (void*)-1;
@@ -703,7 +703,7 @@ namespace TarPacker
       struct_stat_t *s = (struct_stat_t *)_stat;
       static int inode_num = 0;
 
-      fs_File f = fs->open(path, FILE_READ);
+      fs_File f = fs->open(path, fs_file_read);
       if(!f) {
         log_e("Unable to open %s for stat", path);
         return -1;
@@ -961,7 +961,7 @@ namespace TarPacker
 
   int pack_files(fs_FS *srcFS, std::vector<dir_entity_t> dirEntities, fs_FS *dstFS, const char*tar_output_file_path, const char* tar_prefix)
   {
-    auto tar = dstFS->open(tar_output_file_path, FILE_WRITE);
+    auto tar = dstFS->open(tar_output_file_path, fs_file_write);
     if(!tar)
       return -1;
     auto ret = pack_files(srcFS, dirEntities, &tar, tar_prefix);
@@ -985,7 +985,7 @@ namespace TarGzPacker
   // tar-to-gz compression from files/folders list
   int compress(fs_FS *srcFS, std::vector<dir_entity_t> dirEntities, fs_FS *dstFS, const char* tgz_name, const char* tar_prefix)
   {
-    auto dstFile = dstFS->open(tgz_name, FILE_WRITE);
+    auto dstFile = dstFS->open(tgz_name, fs_file_write);
     if(!dstFile) {
       log_e("Can't open %s for writing", tgz_name);
       return -1;

src/libpacker/LibPacker.hpp

@@ -168,7 +168,7 @@ namespace TAR
     assert(fs);
     assert(dirname);
 
-    File root = fs->open(dirname, FILE_READ);
+    File root = fs->open(dirname, fs_file_read);
     if (!root) {
       log_e("Failed to open directory %s", dirname);
       return;

src/libunpacker/LibUnpacker.cpp

@@ -387,7 +387,7 @@ void BaseUnpacker::hexDumpData( const char* buff, size_t buffsize, uint32_t outp
 // show the contents of a given file as a hex dump
 void BaseUnpacker::hexDumpFile( fs_FS &fs, const char* filename, uint32_t output_size )
 {
-  File binFile = fs.open( filename, FILE_READ );
+  File binFile = fs.open( filename, fs_file_read );
   //log_w("File size : %d", binFile.size() );
   // only dump small files
   if( binFile.size() > 0 ) {
@@ -412,7 +412,7 @@ void BaseUnpacker::hexDumpFile( fs_FS &fs, const char* filename, uint32_t output
 
   void BaseUnpacker::tarGzListDir( fs_FS &fs, const char * dirName, uint8_t levels, bool hexDump )
   {
-    File root = fs.open( dirName, FILE_READ );
+    File root = fs.open( dirName, fs_file_read );
     if( !root ) {
       log_e("[ERROR] in tarGzListDir: Can't open %s dir", dirName );
       if( halt_on_error() ) targz_system_halt();
@@ -482,7 +482,7 @@ void BaseUnpacker::hexDumpFile( fs_FS &fs, const char* filename, uint32_t output
     //void( hexDump ); // not used (yet?) with ESP82
     Serial.printf("Listing directory %s with level %d\n", dirname, levels);
 
-    File root = fs.open(dirname, FILE_READ);
+    File root = fs.open(dirname, fs_file_read);
     if( !root.isDirectory() ){
       log_e( "%s is not a directory", dirname );
       return;
@@ -640,7 +640,7 @@ int TarUnpacker::tarHeaderCallBack( TAR::header_translated_t *header,  CC_UNUSED
       if( tarFS->exists( tar_file_path ) ) {
         // file will be truncated
         /*
-        untarredFile = tarFS->open( file_path, FILE_READ );
+        untarredFile = tarFS->open( file_path, fs_file_read );
         bool isdir = untarredFile.isDirectory();
         untarredFile.close();
         if( isdir ) {
@@ -665,7 +665,7 @@ int TarUnpacker::tarHeaderCallBack( TAR::header_translated_t *header,  CC_UNUSED
         log_v("[TAR] Creating %s", tar_file_path);
       }
 
-      untarredFile = tarFS->open(tar_file_path, FILE_WRITE);
+      untarredFile = tarFS->open(tar_file_path, fs_file_wplus);
       if(!untarredFile) {
         log_e("[ERROR] in tarHeaderCallBack: Could not open [%s] for write, filesystem full?", tar_file_path);
         setError( ESP32_TARGZ_FS_ERROR );
@@ -738,7 +738,7 @@ int TarUnpacker::tarEndCallBack( TAR::header_translated_t *header, CC_UNUSED int
         return ESP32_TARGZ_FS_WRITE_ERROR;
       }
       // health check 3: reopen file to check size on filesystem
-      untarredFile = tarFS->open(tar_file_path, FILE_READ);
+      untarredFile = tarFS->open(tar_file_path, fs_file_read);
       size_t tmpsize = untarredFile.size();
       if( !untarredFile ) {
         log_e("[TAR ERROR] Failed to re-open %s for size reading", tar_file_path);
@@ -1015,7 +1015,7 @@ bool TarUnpacker::tarExpander( fs_FS &sourceFS, const char* fileName, fs_FS &des
     setError( ESP32_TARGZ_FS_ERROR );
     return false;
   }
-  fs_File tarFile = sourceFS.open( fileName, FILE_READ );
+  fs_File tarFile = sourceFS.open( fileName, fs_file_read );
   return tarStreamExpander( (Stream*)&tarFile, tarFile.size(), destFS, destFolder );
 }
 
@@ -1477,7 +1477,7 @@ bool GzUnpacker::gzExpander( fs_FS sourceFS, const char* sourceFile, fs_FS destF
   if(tgzLogger)
     tgzLogger("[GZ] Expanding %s to %s\n", sourceFile, destFile );
 
-  fs_File gz = sourceFS.open( sourceFile, FILE_READ );
+  fs_File gz = sourceFS.open( sourceFile, fs_file_read );
   if( !gzProgressCallback ) {
     setGzProgressCallback( defaultProgressCallback );
   }
@@ -1493,7 +1493,7 @@ bool GzUnpacker::gzExpander( fs_FS sourceFS, const char* sourceFile, fs_FS destF
     log_v("[GZ INFO] Deleting %s as it is in the way", destFile);
     destFS.remove( destFile );
   }
-  fs_File outfile = destFS.open( destFile, FILE_WRITE );
+  fs_File outfile = destFS.open( destFile, fs_file_wplus );
   if(!outfile) {
     log_e("[GZ ERROR] in gzExpander: cannot create destination file, no space left on device ?");
     gz.close();
@@ -1523,7 +1523,7 @@ bool GzUnpacker::gzExpander( fs_FS sourceFS, const char* sourceFile, fs_FS destF
   log_v("uzLib expander finished!");
 
   /*
-  outfile = destFS.open( destFile, FILE_READ );
+  outfile = destFS.open( destFile, fs_file_read );
   log_d("Expanded %s to %s (%d bytes)", sourceFile, destFile, outfile.size() );
   outfile.close();
   */
@@ -1591,7 +1591,7 @@ bool GzUnpacker::gzStreamExpander( Stream* sourceStream, fs_FS destFS, const cha
         log_v("[GZ INFO] Deleting %s as it is in the way", destFile);
         destFS.remove( destFile );
     }
-    fs_File outFile = destFS.open(destFile, FILE_WRITE);
+    fs_File outFile = destFS.open(destFile, fs_file_wplus);
     if(!outFile) {
         log_e("[GZ ERROR] in gzExpander: cannot create destination file, no space left on device ?");
         setError( ESP32_TARGZ_UZLIB_INVALID_FILE );
@@ -1619,7 +1619,7 @@ bool GzUnpacker::gzStreamExpander( Stream* sourceStream, fs_FS destFS, const cha
     log_v("uzLib expander finished!");
 
     /*
-    outfile = destFS.open( destFile, FILE_READ );
+    outfile = destFS.open( destFile, fs_file_read );
     log_d("Expanded %s to %s (%d bytes)", sourceFile, destFile, outfile.size() );
     outfile.close();
     */
@@ -1723,7 +1723,7 @@ bool GzUnpacker::gzStreamExpander( Stream *stream, size_t gz_size )
       return false;
     }
     log_v("uzLib SPIFFS Updater start!");
-    fs_File gz = fs.open( gz_filename, FILE_READ );
+    fs_File gz = fs.open( gz_filename, fs_file_read );
     #if defined ESP8266
       int update_size = gz.size();
     #endif
@@ -2069,7 +2069,7 @@ bool TarGzUnpacker::tarGzExpanderNoTempFile( fs_FS sourceFS, const char* sourceF
     setError( ESP32_TARGZ_UZLIB_INVALID_FILE );
     return false;
   }
-  fs_File gz = sourceFS.open( sourceFile, FILE_READ );
+  fs_File gz = sourceFS.open( sourceFile, fs_file_read );
 
   if(tgzLogger)
     tgzLogger("[TGZ] Will direct-expand %s to %s\n", sourceFile, destFolder );

src/types/esp32_targz_types.h

@@ -70,9 +70,24 @@ typedef void (*genericLoggerCallback)( const char* format, ... ); // same behavi
   #define fs_SeekMode SeekMode
   #define fs_SeekSet SeekSet
 
+  #define fs_file_read   FILE_READ
+  #define fs_file_write  FILE_WRITE
+  #define fs_file_wplus FILE_WRITE_BEGIN
+
 
 #else
 
+  #ifndef FILE_READ
+    #define FILE_READ "r"
+  #endif
+  #ifndef FILE_WRITE
+    #define FILE_WRITE "w+"
+  #endif
+
+  #define fs_file_read   FILE_READ
+  #define fs_file_write  FILE_WRITE
+  #define fs_file_wplus FILE_WRITE_BEGIN
+
   #define fs_FS fs::FS
   #define fs_File fs::File
   #define fs_SeekMode fs::SeekMode