Skip to content

libgis: Fix G_init_locale recursion and add GISBASE fallback for resource dirs #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wenzeslaus wants to merge 2 commits into
base: fix_cmake_share_dir
Choose a base branch
from
Open

libgis: Fix G_init_locale recursion and add GISBASE fallback for resource dirs #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee5faa
libgis: Avoid infinite recursion in G_init_locale on missing variable
wenzeslaus Jul 4, 2026
e650ea6
libgis: Fall back to GISBASE-relative paths for resource directories
wenzeslaus Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/gis/locale.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ void G_init_locale(void)
#ifdef LC_MESSAGES
setlocale(LC_MESSAGES, "");
#endif
const char *localedir = G_locale_dir();
/* Not using G_locale_dir(): its G_fatal_error() would translate the
message and re-enter G_init_locale(), recursing without bound. */
const char *localedir = getenv("GRASS_LOCALEDIR");

if (localedir && *localedir) {
bindtextdomain("grasslibs", localedir);
Expand Down
31 changes: 24 additions & 7 deletions lib/gis/resource_dirs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,61 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>

#include <grass/gis.h>
#include <grass/glocale.h>

static const char *get_g_env(const char *);
static const char *get_g_env(const char *, const char *);

const char *G_colors_dir(void)
{
return get_g_env("GRASS_COLORSDIR");
return get_g_env("GRASS_COLORSDIR", "etc/colors");
}

const char *G_etcbin_dir(void)
{
return get_g_env("GRASS_ETCBINDIR");
return get_g_env("GRASS_ETCBINDIR", "etc");
}

const char *G_etc_dir(void)
{
return get_g_env("GRASS_ETCDIR");
return get_g_env("GRASS_ETCDIR", "etc");
}

const char *G_fonts_dir(void)
{
return get_g_env("GRASS_FONTSDIR");
return get_g_env("GRASS_FONTSDIR", "fonts");
}

const char *G_locale_dir(void)
{
return get_g_env("GRASS_LOCALEDIR");
return get_g_env("GRASS_LOCALEDIR", "locale");
}

static const char *get_g_env(const char *env_var)
/*!
\brief Get a resource directory from the environment.

Falls back to the legacy (non-FHS) location relative to GISBASE when
the variable is not set. Fatal when neither yields an existing path.
*/
static const char *get_g_env(const char *env_var, const char *gisbase_rel_dir)
{
const char *value = getenv(env_var);
if (value)
return value;

const char *gisbase = getenv("GISBASE");
if (gisbase && *gisbase) {
char path[GPATH_MAX];

snprintf(path, sizeof(path), "%s/%s", gisbase, gisbase_rel_dir);
if (access(path, F_OK) == 0)
return G_store(path);
}

G_fatal_error(_("Incomplete GRASS session: Variable '%s' not set"),
env_var);
}