From 957a3efd3ea2d7b087f0b70f8cd4b733dfa4d29d Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Wed, 29 Nov 2017 20:32:04 +0000 Subject: Factor out setting of environment variables --- src/imv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/imv.c b/src/imv.c index df19297..904678b 100644 --- a/src/imv.c +++ b/src/imv.c @@ -107,6 +107,7 @@ void command_set_slideshow_duration(struct list *args, const char *argstr, void static bool setup_window(struct imv *imv); static void handle_event(struct imv *imv, SDL_Event *event); static void render_window(struct imv *imv); +static void update_env_vars(struct imv *imv); static size_t generate_title_text(struct imv *imv, char *buf, size_t len); static size_t generate_overlay_text(struct imv *imv, char *buf, size_t len); @@ -1085,7 +1086,7 @@ void command_exec(struct list *args, const char *argstr, void *data) { (void)args; struct imv *imv = data; - setenv("imv_current_file", imv_navigator_selection(imv->navigator), 1); + update_env_vars(imv); system(argstr); } @@ -1170,6 +1171,11 @@ void command_set_slideshow_duration(struct list *args, const char *argstr, void } } +static void update_env_vars(struct imv *imv) +{ + setenv("imv_current_file", imv_navigator_selection(imv->navigator), 1); +} + static size_t generate_title_text(struct imv *imv, char *buf, size_t buf_len) { const char *current_path = imv_navigator_selection(imv->navigator); -- cgit v1.2.3