MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix file.list() zero sizes. Fixes #3549. 

The modern spiffs backend doesn't like stat("./somefile") for something
on the root of the filesystem, and instead only accepts "somefile"
(it also doesn't like "/somefile"). The error from stat was being
ignored which is why the file sizes all appeared to be zero.

The fix is to change file.list() to pass just the filename, unless a
directory was passed to list(). Also improved error handling a bit.
This commit is contained in:
Tom Sutcliffe 2022-11-06 13:29:03 +00:00 committed by Johny Mattsson
parent cad125c477
commit e3883cd27b
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/modules/file.c
View File

@ -37,20 +37,33 @@ static int file_format( lua_State* L )
// Lua: list()
static int file_list( lua_State* L )
{
const char *dirname = luaL_optstring(L, 1, ".");
const char *dirname = luaL_optstring(L, 1, NULL);
DIR *dir;
if ((dir = opendir(dirname))) {
if ((dir = opendir(dirname ? dirname : "/"))) {
lua_newtable( L );
struct dirent *e;
while ((e = readdir(dir))) {
char *fname;
asprintf(&fname, "%s/%s", dirname, e->d_name);
if (!fname)
return luaL_error(L, "no memory");
char *fname = NULL;
if (dirname) {
asprintf(&fname, "%s/%s", dirname, e->d_name);
if (!fname) {
closedir(dir);
return luaL_error(L, "no memory");
}
} else {
fname = e->d_name;
}
struct stat st = { 0, };
stat(fname, &st);
free(fname);
int err = stat(fname, &st);
if (err) {
// We historically ignored this error, so just warn (although it
// shouldn't really happen now).
NODE_ERR("Failed to stat %s err=%d\n", fname, err);
}
if (dirname) {
free(fname);
}
lua_pushinteger(L, st.st_size);
lua_setfield(L, -2, e->d_name);
}