wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

INTIME: whitespace fixup and zero context in wc_ReadDirFirst

Browse Source
This commit is contained in:
Elms
2021-03-25 10:50:04 -07:00
parent c3e6195da5
commit 4eb4cecff4
2 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
wolfcrypt/src/wc_port.c
View File

@ -431,7 +431,7 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
XMEMSET(ctx->name, 0, MAX_FILENAME_SZ); XMEMSET(ctx, 0, sizeof(ReadDirCtx));
pathLen = (int)XSTRLEN(path); pathLen = (int)XSTRLEN(path);
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
@ -466,34 +466,34 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
} while (FindNextFileA(ctx->hFind, &ctx->FindFileData)); } while (FindNextFileA(ctx->hFind, &ctx->FindFileData));
#elif defined(INTIME_RTOS) #elif defined(INTIME_RTOS)
if (pathLen > MAX_FILENAME_SZ - 3) if (pathLen > MAX_FILENAME_SZ - 3)
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ - 3); XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ - 3);
XSTRNCPY(ctx->name + pathLen, "\\*", MAX_FILENAME_SZ - pathLen); XSTRNCPY(ctx->name + pathLen, "\\*", MAX_FILENAME_SZ - pathLen);
if (!FindFirstRtFile(ctx->name, &ctx->FindFileData, 0)) { if (!FindFirstRtFile(ctx->name, &ctx->FindFileData, 0)) {
WOLFSSL_MSG("FindFirstFile for path verify locations failed"); WOLFSSL_MSG("FindFirstFile for path verify locations failed");
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
do { do {
if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) { if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) {
dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName); dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\'; ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName, ctx->FindFileData.cFileName,
MAX_FILENAME_SZ - pathLen - 1); MAX_FILENAME_SZ - pathLen - 1);
if (name) if (name)
*name = ctx->name; *name = ctx->name;
return 0; return 0;
} }
} while (FindNextRtFile(&ctx->FindFileData)); } while (FindNextRtFile(&ctx->FindFileData));
#elif defined(WOLFSSL_ZEPHYR) #elif defined(WOLFSSL_ZEPHYR)
if (fs_opendir(&ctx->dir, path) != 0) { if (fs_opendir(&ctx->dir, path) != 0) {
@ -633,23 +633,23 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
} }
#elif defined(INTIME_RTOS) #elif defined(INTIME_RTOS)
while (FindNextRtFile(&ctx->FindFileData)) { while (FindNextRtFile(&ctx->FindFileData)) {
if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) { if (!(ctx->FindFileData.dwFileAttributes & FILE_ATTR_DIRECTORY)) {
dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName); dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\'; ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName, ctx->FindFileData.cFileName,
MAX_FILENAME_SZ - pathLen - 1); MAX_FILENAME_SZ - pathLen - 1);
if (name) if (name)
*name = ctx->name; *name = ctx->name;
return 0; return 0;
} }
} }
#elif defined(WOLFSSL_ZEPHYR) #elif defined(WOLFSSL_ZEPHYR)
while ((fs_readdir(&ctx->dir, &ctx->entry)) != 0) { while ((fs_readdir(&ctx->dir, &ctx->entry)) != 0) {
@ -748,7 +748,7 @@ void wc_ReadDirClose(ReadDirCtx* ctx)
} }
#elif defined(INTIME_RTOS) #elif defined(INTIME_RTOS)
FindRtFileClose(&ctx->FindFileData); FindRtFileClose(&ctx->FindFileData);
#elif defined(WOLFSSL_ZEPHYR) #elif defined(WOLFSSL_ZEPHYR)
if (ctx->dirp) { if (ctx->dirp) {

2
wolfssl/wolfcrypt/wc_port.h
View File

@ -730,7 +730,7 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
struct M2MB_DIRENT* entry; struct M2MB_DIRENT* entry;
struct M2MB_STAT s; struct M2MB_STAT s;
#elif defined(INTIME_RTOS) #elif defined(INTIME_RTOS)
FIND_FILE_DATA FindFileData; FIND_FILE_DATA FindFileData;
#else #else
struct dirent* entry; struct dirent* entry;
DIR* dir; DIR* dir;