WOLFSSH_USER_FILESYSTEM, fix WOLFSSL_USER_IO conflict

src/port.c

@@ -38,7 +38,7 @@
 #endif
 
 
-#ifndef NO_FILESYSTEM
+#if !defined(NO_FILESYSTEM) && !defined(WOLFSSH_USER_FILESYSTEM)
 int wfopen(WFILE** f, const char* filename, const char* mode)
 {
 #ifdef USE_WINDOWS_API

src/ssh.c

@@ -1572,7 +1572,7 @@ int wolfSSH_ReadKey_file(const char* name,
         return WS_MEMORY_E;
     }
 
-    ret = (int)XFREAD(in, 1, inSz, file);
+    ret = (int)WFREAD(in, 1, inSz, file);
     if (ret <= 0 || (word32)ret != inSz) {
         ret = WS_BAD_FILE_E;
     }

src/wolfsftp.c

@@ -951,10 +951,12 @@ static INLINE int SFTP_GetSz(byte* buf, word32* sz,
 
 #ifndef NO_WOLFSSH_SERVER
 
+#ifndef WOLFSSH_USER_FILESYSTEM
 static int SFTP_GetAttributes(void* fs, const char* fileName,
         WS_SFTP_FILEATRB* atr, byte link, void* heap);
 static int SFTP_GetAttributes_Handle(WOLFSSH* ssh, byte* handle, int handleSz,
         WS_SFTP_FILEATRB* atr);
+#endif
 
 /* unique from other packets because the request ID is not also sent.
  *
@@ -4198,6 +4200,9 @@ int SFTP_GetAttributes_Handle(WOLFSSH* ssh, byte* handle, int handleSz,
     return WS_SUCCESS;
 }
 
+#elif defined(WOLFSSH_USER_FILESYSTEM)
+    /* User-defined I/O support */
+    
 #else
 
 /* @TODO can be overriden by user for portability

wolfssh/port.h

@@ -208,7 +208,8 @@ extern "C" {
         return 0;
     }
     #define WCHMOD(fs,f,m)         wChmod((fs),(f),(m))
-
+#elif defined(WOLFSSH_USER_FILESYSTEM)
+    /* User-defined I/O support */
 #else
     #include <stdlib.h>
     #if !defined(_WIN32_WCE) && !defined(FREESCALE_MQX)
@@ -1010,9 +1011,11 @@ extern "C" {
         #define WDIR HANDLE
     #endif /* NO_WOLFSSH_DIR */
 
-#elif defined(WOLFSSH_USER_IO)
+#elif defined(WOLFSSH_USER_FILESYSTEM)
     /* User-defined I/O support */
+    #include "myFilesystem.h"
 #else
+   
     #include <unistd.h>   /* used for rmdir */
     #include <sys/stat.h> /* used for mkdir, stat, and lstat */
     #include <stdio.h>    /* used for remove and rename */