walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fix problem with fatal error message 

Previous implementation was broken.

Ensure the error file is always written and write its location in the error message
This commit is contained in:
Francesco Abbate 2021-03-05 23:46:41 +01:00
parent 877e4ac6e2
commit 09332fe242
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/core/init.lua
View File

@ -877,7 +877,7 @@ end
function core.on_error(err) function core.on_error(err)
-- write error to file -- write error to file
local fp = io.open(EXEDIR .. "/error.txt", "wb") local fp = io.open(USERDIR .. "/error.txt", "wb")
fp:write("Error: " .. tostring(err) .. "\n") fp:write("Error: " .. tostring(err) .. "\n")
fp:write(debug.traceback(nil, 4)) fp:write(debug.traceback(nil, 4))
fp:close() fp:close()

27
src/main.c
View File

@ -63,11 +63,11 @@ static void init_window_icon(void) {
#ifdef _WIN32 #ifdef _WIN32
#define LITE_OS_HOME "USERPROFILE" #define LITE_OS_HOME "USERPROFILE"
#define LITE_PATHSEP_PATTERN "\\\\" #define LITE_PATHSEP_PATTERN "\\\\"
#define LITE_NONPATHSEP_PATTERN "[^\\\\]" #define LITE_NONPATHSEP_PATTERN "[^\\\\]+"
#else #else
#define LITE_OS_HOME "HOME" #define LITE_OS_HOME "HOME"
#define LITE_PATHSEP_PATTERN "/" #define LITE_PATHSEP_PATTERN "/"
#define LITE_NONPATHSEP_PATTERN "[^/]" #define LITE_NONPATHSEP_PATTERN "[^/]+"
#endif #endif
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -127,23 +127,28 @@ init_lua:
"local core\n" "local core\n"
"xpcall(function()\n" "xpcall(function()\n"
" HOME = os.getenv('" LITE_OS_HOME "')\n" " HOME = os.getenv('" LITE_OS_HOME "')\n"
" local exedir = EXEFILE:match(\"^(.+)" LITE_PATHSEP_PATTERN LITE_NONPATHSEP_PATTERN "+$\")\n" " local exedir = EXEFILE:match(\"^(.*)" LITE_PATHSEP_PATTERN LITE_NONPATHSEP_PATTERN "$\")\n"
" local prefix = exedir:match(\"^(.+)" LITE_PATHSEP_PATTERN "bin$\")\n" " local prefix = exedir:match(\"^(.*)" LITE_PATHSEP_PATTERN "bin$\")\n"
" dofile((prefix and prefix .. '/share/lite-xl' or exedir .. '/data') .. '/core/start.lua')\n" " dofile((prefix and prefix .. '/share/lite-xl' or exedir .. '/data') .. '/core/start.lua')\n"
" core = require('core')\n" " core = require('core')\n"
" core.init()\n" " core.init()\n"
" core.run()\n" " core.run()\n"
"end, function(err)\n" "end, function(err)\n"
" system.show_fatal_error('Lite XL start error', '" " local error_dir\n"
"Fatal error: cannot locate the data directory.\\n" " print('ERROR', err)\n"
"Please verify that the data folder is available.')\n"
" local fp = io.open((exedir and exedir .. '/' or '') .. 'error.txt', 'wb')\n"
" fp:write('Error: ' .. tostring(err) .. '\\n')\n"
" fp:write(debug.traceback(nil, 2) .. '\\n')\n"
" fp:close()\n"
" if core and core.on_error then\n" " if core and core.on_error then\n"
" error_dir=USERDIR\n"
" pcall(core.on_error, err)\n" " pcall(core.on_error, err)\n"
" else\n"
" error_dir=system.absolute_path('.')\n"
" local fp = io.open('error.txt', 'wb')\n"
" fp:write('Error: ' .. tostring(err) .. '\\n')\n"
" fp:write(debug.traceback(nil, 4))\n"
" fp:close()\n"
" end\n" " end\n"
" system.show_fatal_error('Lite XL internal error',\n"
" 'An internal error occurred in a critical part of the application.\\n\\n'..\n"
" 'Please verify the file \\\"error.txt\\\" in the directory '..error_dir)\n"
" os.exit(1)\n" " os.exit(1)\n"
"end)\n" "end)\n"
"return core and core.restart_request\n"; "return core and core.restart_request\n";