mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-28 13:46:36 +00:00
Update lv_fs_pc.c
This commit is contained in:
parent
c71203439b
commit
3618305d42
@ -3,32 +3,31 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "lv_fs_if.h"
|
#include "lv_fs_if.h"
|
||||||
#if LV_USE_FS_IF
|
#if LV_USE_FS_IF
|
||||||
#if LV_FS_IF_PC != '\0'
|
#if LV_FS_IF_PC != '\0'
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
*********************/
|
*********************/
|
||||||
#ifndef LV_FS_PC_PATH
|
#ifndef LV_FS_PC_PATH
|
||||||
# ifndef WIN32
|
#ifndef WIN32
|
||||||
# define LV_FS_PC_PATH "./" /*Projet root*/
|
#define LV_FS_PC_PATH "/fs" /*Projet root*/
|
||||||
# else
|
#else
|
||||||
# define LV_FS_PC_PATH ".\\" /*Projet root*/
|
#define LV_FS_PC_PATH ".\\" /*Projet root*/
|
||||||
# endif
|
#endif
|
||||||
#endif /*LV_FS_PATH*/
|
#endif /*LV_FS_PATH*/
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
* TYPEDEFS
|
* TYPEDEFS
|
||||||
@ -37,31 +36,30 @@
|
|||||||
/* Create a type to store the required data about your file. */
|
/* Create a type to store the required data about your file. */
|
||||||
typedef FILE * file_t;
|
typedef FILE * file_t;
|
||||||
|
|
||||||
/*Similarly to `file_t` create a type for directory reading too */
|
/*Similarly to `file_t` create a type for directory reading too */
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
typedef DIR * dir_t;
|
typedef DIR * dir_t;
|
||||||
#else
|
#else
|
||||||
typedef HANDLE dir_t;
|
typedef HANDLE dir_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
* STATIC PROTOTYPES
|
* STATIC PROTOTYPES
|
||||||
**********************/
|
**********************/
|
||||||
static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
|
static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode);
|
||||||
static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p);
|
static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p);
|
||||||
static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
|
static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br);
|
||||||
static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw);
|
static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw);
|
||||||
static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos);
|
static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos);
|
||||||
static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p);
|
static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p);
|
||||||
static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
|
static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
|
||||||
static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path);
|
static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path);
|
||||||
static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p);
|
static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p);
|
||||||
static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const char * newname);
|
static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname);
|
||||||
static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p);
|
static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p);
|
||||||
static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *path);
|
static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path);
|
||||||
static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn);
|
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn);
|
||||||
static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p);
|
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p);
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
* STATIC VARIABLES
|
* STATIC VARIABLES
|
||||||
@ -123,30 +121,36 @@ void lv_fs_if_pc_init(void)
|
|||||||
* @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR
|
* @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode)
|
static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
const char * flags = "";
|
const char * flags = "";
|
||||||
|
|
||||||
if(mode == LV_FS_MODE_WR) flags = "wb";
|
if(mode == LV_FS_MODE_WR)
|
||||||
else if(mode == LV_FS_MODE_RD) flags = "rb";
|
flags = "wb";
|
||||||
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) flags = "rb+";
|
else if(mode == LV_FS_MODE_RD)
|
||||||
|
flags = "rb";
|
||||||
|
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD))
|
||||||
|
flags = "rb+";
|
||||||
|
|
||||||
/*Make the path relative to the current directory (the projects root folder)*/
|
/*Make the path relative to the current directory (the projects root folder)*/
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
char buf[256];
|
char buf[256];
|
||||||
sprintf(buf, LV_FS_PC_PATH "/%s", path);
|
sprintf(buf, LV_FS_PC_PATH "/%s", path);
|
||||||
#else
|
printf("%s\n", buf);
|
||||||
|
#else
|
||||||
char buf[256];
|
char buf[256];
|
||||||
sprintf(buf, LV_FS_PC_PATH "\\%s", path);
|
sprintf(buf, LV_FS_PC_PATH "\\%s", path);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
file_t f = fopen(buf, flags);
|
file_t f = fopen(buf, flags);
|
||||||
if(f == NULL) return LV_FS_RES_UNKNOWN;
|
if(f == NULL) {
|
||||||
|
printf("Failed to open %s\n", buf);
|
||||||
|
return LV_FS_RES_UNKNOWN;
|
||||||
|
}
|
||||||
/*Be sure we are the beginning of the file*/
|
/*Be sure we are the beginning of the file*/
|
||||||
fseek(f, 0, SEEK_SET);
|
fseek(f, 0, SEEK_SET);
|
||||||
|
|
||||||
@ -158,7 +162,6 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path,
|
|||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close an opened file
|
* Close an opened file
|
||||||
* @param drv pointer to a driver where this function belongs
|
* @param drv pointer to a driver where this function belongs
|
||||||
@ -166,9 +169,9 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path,
|
|||||||
* @return LV_FS_RES_OK: no error, the file is read
|
* @return LV_FS_RES_OK: no error, the file is read
|
||||||
* any error from lv_fs_res_t enum
|
* any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p)
|
static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
fclose(*fp);
|
fclose(*fp);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
@ -184,9 +187,9 @@ static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p)
|
|||||||
* @return LV_FS_RES_OK: no error, the file is read
|
* @return LV_FS_RES_OK: no error, the file is read
|
||||||
* any error from lv_fs_res_t enum
|
* any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br)
|
static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
*br = fread(buf, 1, btr, *fp);
|
*br = fread(buf, 1, btr, *fp);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
@ -203,7 +206,7 @@ static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32
|
|||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw)
|
static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
*bw = fwrite(buf, 1, btw, *fp);
|
*bw = fwrite(buf, 1, btw, *fp);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
@ -217,9 +220,9 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
|
|||||||
* @return LV_FS_RES_OK: no error, the file is read
|
* @return LV_FS_RES_OK: no error, the file is read
|
||||||
* any error from lv_fs_res_t enum
|
* any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos)
|
static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
fseek(*fp, pos, SEEK_SET);
|
fseek(*fp, pos, SEEK_SET);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
@ -232,9 +235,9 @@ static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos)
|
|||||||
* @param size pointer to a variable to store the size
|
* @param size pointer to a variable to store the size
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
|
static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
|
|
||||||
uint32_t cur = ftell(*fp);
|
uint32_t cur = ftell(*fp);
|
||||||
@ -255,9 +258,9 @@ static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
|
|||||||
* @return LV_FS_RES_OK: no error, the file is read
|
* @return LV_FS_RES_OK: no error, the file is read
|
||||||
* any error from lv_fs_res_t enum
|
* any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
|
static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
*pos_p = ftell(*fp);
|
*pos_p = ftell(*fp);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
@ -269,9 +272,9 @@ static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
|
|||||||
* @param path path of the file to delete
|
* @param path path of the file to delete
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path)
|
static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||||
|
|
||||||
/* Add your code here*/
|
/* Add your code here*/
|
||||||
@ -286,14 +289,14 @@ static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path)
|
|||||||
* @return LV_FS_RES_OK: no error, the file is read
|
* @return LV_FS_RES_OK: no error, the file is read
|
||||||
* any error from lv_fs_res_t enum
|
* any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p)
|
static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
file_t * fp = file_p; /*Just avoid the confusing casings*/
|
||||||
|
|
||||||
fflush(*fp); /*If not syncronized fclose can write the truncated part*/
|
fflush(*fp); /*If not syncronized fclose can write the truncated part*/
|
||||||
uint32_t p = ftell(*fp);
|
uint32_t p = ftell(*fp);
|
||||||
ftruncate(fileno(*fp), p);
|
// ftruncate(fileno(*fp), p);
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -304,9 +307,9 @@ static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p)
|
|||||||
* @param newname path with the new name
|
* @param newname path with the new name
|
||||||
* @return LV_FS_RES_OK or any error from 'fs_res_t'
|
* @return LV_FS_RES_OK or any error from 'fs_res_t'
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const char * newname)
|
static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
static char new[512];
|
static char new[512];
|
||||||
static char old[512];
|
static char old[512];
|
||||||
|
|
||||||
@ -315,8 +318,10 @@ static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const cha
|
|||||||
|
|
||||||
int r = rename(old, new);
|
int r = rename(old, new);
|
||||||
|
|
||||||
if(r == 0) return LV_FS_RES_OK;
|
if(r == 0)
|
||||||
else return LV_FS_RES_UNKNOWN;
|
return LV_FS_RES_OK;
|
||||||
|
else
|
||||||
|
return LV_FS_RES_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -327,9 +332,9 @@ static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const cha
|
|||||||
* @param free_p pointer to store the free size [kB]
|
* @param free_p pointer to store the free size [kB]
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p)
|
static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||||
|
|
||||||
/* Add your code here*/
|
/* Add your code here*/
|
||||||
@ -337,10 +342,9 @@ static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * fr
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
#ifdef WIN32
|
|
||||||
static char next_fn[256];
|
static char next_fn[256];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize a 'fs_read_dir_t' variable for directory reading
|
* Initialize a 'fs_read_dir_t' variable for directory reading
|
||||||
@ -349,15 +353,15 @@ static char next_fn[256];
|
|||||||
* @param path path to a directory
|
* @param path path to a directory
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *path)
|
static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
dir_t d;
|
dir_t d;
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
/*Make the path relative to the current directory (the projects root folder)*/
|
/*Make the path relative to the current directory (the projects root folder)*/
|
||||||
char buf[256];
|
char buf[256];
|
||||||
sprintf(buf, LV_FS_PC_PATH "/%s", path);
|
sprintf(buf, LV_FS_PC_PATH "/%s", path);
|
||||||
if ((d = opendir(buf)) == NULL) {
|
if((d = opendir(buf)) == NULL) {
|
||||||
return LV_FS_RES_FS_ERR;
|
return LV_FS_RES_FS_ERR;
|
||||||
} else {
|
} else {
|
||||||
/* 'dir_p' is pointer to a file descriptor and
|
/* 'dir_p' is pointer to a file descriptor and
|
||||||
@ -365,7 +369,7 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat
|
|||||||
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
||||||
*dp = d;
|
*dp = d;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
d = INVALID_HANDLE_VALUE;
|
d = INVALID_HANDLE_VALUE;
|
||||||
WIN32_FIND_DATA fdata;
|
WIN32_FIND_DATA fdata;
|
||||||
|
|
||||||
@ -376,12 +380,11 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat
|
|||||||
strcpy(next_fn, "");
|
strcpy(next_fn, "");
|
||||||
d = FindFirstFile(buf, &fdata);
|
d = FindFirstFile(buf, &fdata);
|
||||||
do {
|
do {
|
||||||
if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
|
if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
|
if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
|
||||||
{
|
|
||||||
sprintf(next_fn, "/%s", fdata.cFileName);
|
sprintf(next_fn, "/%s", fdata.cFileName);
|
||||||
} else {
|
} else {
|
||||||
sprintf(next_fn, "%s", fdata.cFileName);
|
sprintf(next_fn, "%s", fdata.cFileName);
|
||||||
@ -393,7 +396,7 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat
|
|||||||
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
||||||
*dp = d;
|
*dp = d;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
@ -406,24 +409,26 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat
|
|||||||
* @param fn pointer to a buffer to store the filename
|
* @param fn pointer to a buffer to store the filename
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn)
|
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
dir_t * dp = dir_p; /*Just avoid the confusing casings*/
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
struct dirent *entry;
|
struct dirent * entry;
|
||||||
do {
|
do {
|
||||||
entry = readdir(*dp);
|
entry = readdir(*dp);
|
||||||
|
|
||||||
if(entry) {
|
if(entry) {
|
||||||
if(entry->d_type == DT_DIR) sprintf(fn, "/%s", entry->d_name);
|
if(entry->d_type == DT_DIR)
|
||||||
else strcpy(fn, entry->d_name);
|
sprintf(fn, "/%s", entry->d_name);
|
||||||
|
else
|
||||||
|
strcpy(fn, entry->d_name);
|
||||||
} else {
|
} else {
|
||||||
strcpy(fn, "");
|
strcpy(fn, "");
|
||||||
}
|
}
|
||||||
} while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0);
|
} while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0);
|
||||||
#else
|
#else
|
||||||
strcpy(fn, next_fn);
|
strcpy(fn, next_fn);
|
||||||
|
|
||||||
strcpy(next_fn, "");
|
strcpy(next_fn, "");
|
||||||
@ -431,12 +436,11 @@ static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn)
|
|||||||
|
|
||||||
if(FindNextFile(*dp, &fdata) == false) return LV_FS_RES_OK;
|
if(FindNextFile(*dp, &fdata) == false) return LV_FS_RES_OK;
|
||||||
do {
|
do {
|
||||||
if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
|
if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
|
if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
|
||||||
{
|
|
||||||
sprintf(next_fn, "/%s", fdata.cFileName);
|
sprintf(next_fn, "/%s", fdata.cFileName);
|
||||||
} else {
|
} else {
|
||||||
sprintf(next_fn, "%s", fdata.cFileName);
|
sprintf(next_fn, "%s", fdata.cFileName);
|
||||||
@ -445,7 +449,7 @@ static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn)
|
|||||||
}
|
}
|
||||||
} while(FindNextFile(*dp, &fdata));
|
} while(FindNextFile(*dp, &fdata));
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -455,18 +459,18 @@ static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn)
|
|||||||
* @param dir_p pointer to an initialized 'fs_read_dir_t' variable
|
* @param dir_p pointer to an initialized 'fs_read_dir_t' variable
|
||||||
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum
|
||||||
*/
|
*/
|
||||||
static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p)
|
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p)
|
||||||
{
|
{
|
||||||
(void) drv; /*Unused*/
|
(void)drv; /*Unused*/
|
||||||
dir_t * dp = dir_p;
|
dir_t * dp = dir_p;
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
closedir(*dp);
|
closedir(*dp);
|
||||||
#else
|
#else
|
||||||
FindClose(*dp);
|
FindClose(*dp);
|
||||||
*dp = INVALID_HANDLE_VALUE;
|
*dp = INVALID_HANDLE_VALUE;
|
||||||
#endif
|
#endif
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /*LV_USE_FS_IF*/
|
#endif /*LV_USE_FS_IF*/
|
||||||
#endif /*LV_FS_IF_FATFS*/
|
#endif /*LV_FS_IF_FATFS*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user