From 6c1c6805b32d7d08b6abb0e694572dec88296bb0 Mon Sep 17 00:00:00 2001
From: funshine <guijie.hong@gmail.com>
Date: Fri, 13 Feb 2015 19:23:30 +0800
Subject: [PATCH] modify loadfile to malloc memory according to file size

---
 app/lua/lauxlib.c            | 23 ++++++++++++++++++++---
 app/platform/flash_fs.h      |  1 +
 app/spiffs/spiffs.c          |  3 +++
 app/spiffs/spiffs.h          |  1 +
 app/spiffs/spiffs_hydrogen.c | 19 +++++++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/app/lua/lauxlib.c b/app/lua/lauxlib.c
index fedd7c56..64618f1b 100644
--- a/app/lua/lauxlib.c
+++ b/app/lua/lauxlib.c
@@ -652,7 +652,8 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
 typedef struct LoadFSF {
   int extraline;
   int f;
-  char buff[LUAL_BUFFERSIZE];
+  char *buff;
+  int len;
 } LoadFSF;
 
 
@@ -665,7 +666,7 @@ static const char *getFSF (lua_State *L, void *ud, size_t *size) {
     return "\n";
   }
   if (fs_eof(lf->f)) return NULL;
-  *size = fs_read(lf->f, lf->buff, sizeof(lf->buff));
+  *size = fs_read(lf->f, lf->buff, (lf->len));
   return (*size > 0) ? lf->buff : NULL;
 }
 
@@ -684,6 +685,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
   int c;
   int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
   lf.extraline = 0;
+  // lf.len = LUAL_BUFFERSIZE;
+  lf.len = 0;
+  lf.buff = NULL;
   if (filename == NULL) {
     return luaL_error(L, "filename is NULL");
   }
@@ -692,6 +696,10 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
     lf.f = fs_open(filename, FS_RDONLY);
     if (lf.f < FS_OPEN_OK) return errfsfile(L, "open", fnameindex);
   }
+  lf.len = fs_size(lf.f) + 32;
+  lf.buff = c_zalloc(lf.len);
+  if(!lf.buff) return LUA_ERRMEM;
+
   c = fs_getc(lf.f);
   if (c == '#') {  /* Unix exec. file? */
     lf.extraline = 1;
@@ -701,7 +709,13 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
   if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
     fs_close(lf.f);
     lf.f = fs_open(filename, FS_RDONLY);  /* reopen in binary mode */
-    if (lf.f < FS_OPEN_OK) return errfsfile(L, "reopen", fnameindex);
+    if (lf.f < FS_OPEN_OK){
+      if(lf.buff)
+        c_free(lf.buff);
+      lf.buff = NULL;
+      lf.len = 0;
+      return errfsfile(L, "reopen", fnameindex);
+    }
     /* skip eventual `#!...' */
    while ((c = fs_getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ;
     lf.extraline = 0;
@@ -711,6 +725,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
 
   if (filename) fs_close(lf.f);  /* close file (even in case of errors) */
   lua_remove(L, fnameindex);
+  if(lf.buff)
+    c_free(lf.buff);
+  lf.buff = NULL;
   return status;
 }
 
diff --git a/app/platform/flash_fs.h b/app/platform/flash_fs.h
index 3f7d4710..9d9da7c7 100644
--- a/app/platform/flash_fs.h
+++ b/app/platform/flash_fs.h
@@ -69,6 +69,7 @@
 #define fs_format myspiffs_format
 #define fs_check myspiffs_check
 #define fs_rename myspiffs_rename
+#define fs_size myspiffs_size
 
 #define FS_NAME_MAX_LENGTH SPIFFS_OBJ_NAME_LEN
 
diff --git a/app/spiffs/spiffs.c b/app/spiffs/spiffs.c
index 5434e68d..df749e09 100644
--- a/app/spiffs/spiffs.c
+++ b/app/spiffs/spiffs.c
@@ -165,6 +165,9 @@ void myspiffs_clearerr( int fd ){
 int myspiffs_rename( const char *old, const char *newname ){
   return SPIFFS_rename(&fs, (char *)old, (char *)newname);
 }
+size_t myspiffs_size( int fd ){
+  return SPIFFS_size(&fs, (spiffs_file)fd);
+}
 #if 0
 void test_spiffs() {
   char buf[12];
diff --git a/app/spiffs/spiffs.h b/app/spiffs/spiffs.h
index ca5200fd..c4077ede 100644
--- a/app/spiffs/spiffs.h
+++ b/app/spiffs/spiffs.h
@@ -423,6 +423,7 @@ s32_t SPIFFS_check(spiffs *fs);
  */
 s32_t SPIFFS_eof(spiffs *fs, spiffs_file fh);
 s32_t SPIFFS_tell(spiffs *fs, spiffs_file fh);
+s32_t SPIFFS_size(spiffs *fs, spiffs_file fh);
 
 #if SPIFFS_TEST_VISUALISATION
 /**
diff --git a/app/spiffs/spiffs_hydrogen.c b/app/spiffs/spiffs_hydrogen.c
index 50777b73..20e45ecf 100644
--- a/app/spiffs/spiffs_hydrogen.c
+++ b/app/spiffs/spiffs_hydrogen.c
@@ -798,6 +798,25 @@ s32_t SPIFFS_tell(spiffs *fs, spiffs_file fh) {
   return res;
 }
 
+s32_t SPIFFS_size(spiffs *fs, spiffs_file fh) {
+  SPIFFS_API_CHECK_MOUNT(fs);
+  SPIFFS_LOCK(fs);
+
+  spiffs_fd *fd;
+  s32_t res;
+  res = spiffs_fd_get(fs, fh, &fd);
+  SPIFFS_API_CHECK_RES(fs, res);
+
+#if SPIFFS_CACHE_WR
+  spiffs_fflush_cache(fs, fh);
+#endif
+
+  res = fd->size;
+
+  SPIFFS_UNLOCK(fs);
+  return res;
+}
+
 #if SPIFFS_TEST_VISUALISATION
 s32_t SPIFFS_vis(spiffs *fs) {
   s32_t res = SPIFFS_OK;