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

Adjust EUS to new SPIFFS (#1376)

This commit is contained in:
FrankX 2016-06-28 22:50:23 +02:00 committed by Marcel Stör
parent adf717353a
commit e14dd7aba0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/modules/enduser_setup.c
View File

@ -485,15 +485,20 @@ static int enduser_setup_http_load_payload(void)
{ {
ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload"); ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload");
int err = (FS_OPEN_OK -1);
int err2 = (FS_OPEN_OK -1);
int file_len = 0;
int f = fs_open(http_html_filename, fs_mode2flag("r")); int f = fs_open(http_html_filename, fs_mode2flag("r"));
int err = fs_seek(f, 0, FS_SEEK_END); if (f >= FS_OPEN_OK) {
int file_len = (int) fs_tell(f); err = fs_seek(f, 0, FS_SEEK_END);
int err2 = fs_seek(f, 0, FS_SEEK_SET); file_len = (int) fs_tell(f);
err2 = fs_seek(f, 0, FS_SEEK_SET);
}
const char cl_hdr[] = "Content-length:%5d\r\n\r\n"; const char cl_hdr[] = "Content-length:%5d\r\n\r\n";
const size_t cl_len = LITLEN(cl_hdr) + 3; /* room to expand %4d */ const size_t cl_len = LITLEN(cl_hdr) + 3; /* room to expand %4d */
if (f == 0 || err == -1 || err2 == -1) if (f < FS_OPEN_OK || err < FS_OPEN_OK || err2 < FS_OPEN_OK)
{ {
ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload unable to load file enduser_setup.html, loading backup HTML."); ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload unable to load file enduser_setup.html, loading backup HTML.");
@ -527,6 +532,7 @@ static int enduser_setup_http_load_payload(void)
offset += LITLEN(http_header_200); offset += LITLEN(http_header_200);
offset += c_sprintf(state->http_payload_data + offset, cl_hdr, file_len); offset += c_sprintf(state->http_payload_data + offset, cl_hdr, file_len);
fs_read(f, &(state->http_payload_data[offset]), file_len); fs_read(f, &(state->http_payload_data[offset]), file_len);
fs_close(f);
return 0; return 0;
} }