p
/
hex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Plugin load errors should not be fatal
Arch Linux AUR Success Details

This commit is contained in:
Přemysl Eric Janouch 2024-02-26 23:53:32 +01:00
parent 417115c3be
commit d57db951aa
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hex.c
View File

@ -1,7 +1,7 @@
/* /*
* hex -- hex viewer * hex -- hex viewer
* *
* Copyright (c) 2016 - 2023, Přemysl Eric Janouch <p@janouch.name> * Copyright (c) 2016 - 2024, Přemysl Eric Janouch <p@janouch.name>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted. * purpose with or without fee is hereby granted.
@ -1205,6 +1205,8 @@ app_lua_load_plugins (const char *plugin_dir)
return; return;
} }
lua_pushcfunction (g.L, app_lua_error_handler);
struct dirent *iter; struct dirent *iter;
while ((errno = 0, iter = readdir (dir))) while ((errno = 0, iter = readdir (dir)))
{ {
@ -1213,16 +1215,19 @@ app_lua_load_plugins (const char *plugin_dir)
continue; continue;
char *path = xstrdup_printf ("%s/%s", plugin_dir, iter->d_name); char *path = xstrdup_printf ("%s/%s", plugin_dir, iter->d_name);
lua_pushcfunction (g.L, app_lua_error_handler);
if (luaL_loadfile (g.L, path) if (luaL_loadfile (g.L, path)
|| lua_pcall (g.L, 0, 0, -2)) || lua_pcall (g.L, 0, 0, -2))
exit_fatal ("Lua: %s", lua_tostring (g.L, -1)); {
print_error ("%s: %s", path, lua_tostring (g.L, -1));
lua_pop (g.L, 1); lua_pop (g.L, 1);
}
free (path); free (path);
} }
if (errno) if (errno)
exit_fatal ("readdir: %s", strerror (errno)); exit_fatal ("readdir: %s", strerror (errno));
closedir (dir); closedir (dir);
lua_pop (g.L, 1);
} }
static void static void