diff options
author | Philip Flohr <philip.flohr@student.kit.edu> | 2018-08-02 07:51:13 +0200 |
---|---|---|
committer | Dmitry Podgorny <pasis.ua@gmail.com> | 2018-09-06 19:54:29 +0300 |
commit | 054267d738af1799ed47704d24626b2dab4f962f (patch) | |
tree | 7c2f858d85b1cd24854423151e6d615ac238a366 /src/command | |
parent | a5a7db9e2b63c5748dea312d23aafbb89d660667 (diff) | |
download | profani-tty-054267d738af1799ed47704d24626b2dab4f962f.tar.gz |
Fix extended plugin handling PR
Fixes problems found in PR #999
Diffstat (limited to 'src/command')
-rw-r--r-- | src/command/cmd_funcs.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index fa675309..9cc7b881 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -6625,7 +6625,7 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) cons_show("Failed to install plugin: %s. %s", plugin_name, error_message->str); } g_free(plugin_name); - + g_string_free(error_message, TRUE); free(path); return TRUE; } @@ -6699,24 +6699,31 @@ cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) GString* error_message = g_string_new(NULL); gchar *plugin_name = g_path_get_basename(path); - gboolean result = plugins_unload(plugin_name); - result |= plugins_uninstall(plugin_name); - result |= plugins_install(plugin_name, path, error_message); - if (result) { - cons_show("Plugin installed: %s", plugin_name); + if (plugins_unload(plugin_name)) { + if (plugins_uninstall(plugin_name)) { + if (plugins_install(plugin_name, path, error_message)) { + cons_show("Plugin installed: %s", plugin_name); + } else { + cons_show("Failed to install plugin: %s. %s", plugin_name, error_message->str); + } + } else { + cons_show("Failed to uninstall plugin: %s.", plugin_name); + } } else { - cons_show("Failed to install plugin: %s. %s", plugin_name, error_message->str); + cons_show("Failed to unload plugin: %s.", plugin_name); } g_free(plugin_name); - + g_string_free(error_message, TRUE); free(path); return TRUE; } if (is_dir(path)) { + free(path); return FALSE; } + free(path); cons_show("Argument must be a file or directory."); return TRUE; } |