Use g_get_user_config_dir

Instead of opencoding rely on glib which handles XDG_CONFIG_HOME and
such. This also prevents xdg_config from leaking.
This commit is contained in:
Guido Günther
2021-04-26 17:57:50 +02:00
committed by Martijn Braam
parent 59dde6bb74
commit 0046986e3e
2 changed files with 4 additions and 26 deletions

View File

@@ -9,7 +9,6 @@
#include <tiffio.h>
#include <assert.h>
#include <math.h>
#include <wordexp.h>
#include <gtk/gtk.h>
#include "gl_util.h"
@@ -70,20 +69,10 @@ register_custom_tiff_tags(TIFF *tif)
static bool
find_processor(char *script)
{
char *xdg_config_home;
char filename[] = "postprocess.sh";
wordexp_t exp_result;
// Resolve XDG stuff
if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL) {
xdg_config_home = "~/.config";
}
wordexp(xdg_config_home, &exp_result, 0);
xdg_config_home = strdup(exp_result.we_wordv[0]);
wordfree(&exp_result);
// Check postprocess.h in the current working directory
sprintf(script, "data/%s", filename);
// Check postprocess.sh in the current working directory
sprintf(script, "./data/%s", filename);
if (access(script, F_OK) != -1) {
sprintf(script, "./data/%s", filename);
printf("Found postprocessor script at %s\n", script);
@@ -91,7 +80,7 @@ find_processor(char *script)
}
// Check for a script in XDG_CONFIG_HOME
sprintf(script, "%s/megapixels/%s", xdg_config_home, filename);
sprintf(script, "%s/megapixels/%s", g_get_user_config_dir(), filename);
if (access(script, F_OK) != -1) {
printf("Found postprocessor script at %s\n", script);
return true;