Skip to content

Commit 41d05a9

Browse files
move user filesystem override to the top of the ports check
1 parent 0e5d1fc commit 41d05a9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

wolfssh/port.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ extern "C" {
103103

104104
#if defined(NO_FILESYSTEM) && !defined(WOLFSSH_FATFS)
105105
#define WS_DELIM '/'
106+
107+
#elif defined(WOLFSSH_USER_FILESYSTEM)
108+
/* User-defined I/O support, this should be at the top of the ports list
109+
* to override all */
110+
106111
#elif defined(WOLFSSL_NUCLEUS)
107112
#include "storage/nu_storage.h"
108113

@@ -427,8 +432,6 @@ extern "C" {
427432
#define WFSETTIME(fs,fd,a,m) (0)
428433
#define WCHDIR(fs,b) SYS_FS_DirectryChange((b))
429434

430-
#elif defined(WOLFSSH_USER_FILESYSTEM)
431-
/* User-defined I/O support */
432435
#else
433436
#include <stdlib.h>
434437
#if !defined(_WIN32_WCE) && !defined(FREESCALE_MQX)
@@ -636,7 +639,12 @@ extern "C" {
636639
#endif
637640
#endif
638641

639-
#ifdef WOLFSSL_NUCLEUS
642+
#if defined(WOLFSSH_USER_FILESYSTEM)
643+
/* User-defined I/O support, this should be at the top of the ports list
644+
* to override all */
645+
#include "myFilesystem.h"
646+
647+
#elif defined(WOLFSSL_NUCLEUS)
640648
#define WSTAT_T struct stat
641649
#define WRMDIR(fs,d) (NU_Remove_Dir((d)) == NU_SUCCESS)?0:1
642650
#define WMKDIR(fs,d,m) (NU_Make_Dir((d)) == NU_SUCCESS)?0:1
@@ -1433,9 +1441,6 @@ extern "C" {
14331441
#define WPWRITE(fs,fd,b,s,o) wPwrite((fd),(b),(s),(o))
14341442
#define WPREAD(fs,fd,b,s,o) wPread((fd),(b),(s),(o))
14351443

1436-
#elif defined(WOLFSSH_USER_FILESYSTEM)
1437-
/* User-defined I/O support */
1438-
#include "myFilesystem.h"
14391444
#else
14401445

14411446
#include <unistd.h> /* used for rmdir */

0 commit comments

Comments
 (0)