mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #3684: replace $MC_HOME with $MC_PROFILE_ROOT, a better "profile" mechanism. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Mooffie 2016-09-08 17:02:43 +03:00 committed by Andrew Borodin
parent 84433f43c2
commit 239a8d0117
3 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mcconfig.h
View File

@ -107,6 +107,8 @@ const char *mc_config_get_cache_path (void);
const char *mc_config_get_path (void);
const char *mc_config_get_profile_root (void);
const char *mc_config_get_home_dir (void);
char *mc_config_get_full_path (const char *config_name);

57
lib/mcconfig/paths.c
View File

@ -51,9 +51,6 @@ static char *mc_config_str = NULL;
static char *mc_cache_str = NULL;
static char *mc_data_str = NULL;
/* value of $MC_HOME */
static const char *mc_home = NULL;
static gboolean config_dir_present = FALSE;
static const struct
@ -282,6 +279,30 @@ mc_config_deprecated_dir_present (void)
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/**
* The "profile root" is the tree under which all of MC's user data &
* settings are stored.
*
* It defaults to the user's home dir. The user may override this default
* with the environment variable $MC_PROFILE_ROOT.
*/
const char *
mc_config_get_profile_root (void)
{
static const char *profile_root = NULL;
if (profile_root == NULL)
{
profile_root = g_getenv ("MC_PROFILE_ROOT");
if (profile_root == NULL || *profile_root == '\0')
profile_root = mc_config_get_home_dir ();
}
return profile_root;
}
/* --------------------------------------------------------------------------------------------- */
void
mc_config_init_config_paths (GError ** mcerror)
{
@ -295,21 +316,29 @@ mc_config_init_config_paths (GError ** mcerror)
if (xdg_vars_initialized)
return;
/* init mc_home if not yet */
(void) mc_config_get_home_dir ();
#if MC_HOMEDIR_XDG
if (mc_home != NULL)
if (strcmp (mc_config_get_profile_root (), mc_config_get_home_dir ()) != 0)
{
dir = g_build_filename (mc_home, ".config", (char *) NULL);
/*
* The user overrode the default profile root.
*
* In this case we can't use GLib's g_get_user_{config,cache,data}_dir()
* as these functions use the user's home dir as the root.
*/
const char *profile_root;
profile_root = mc_config_get_profile_root ();
dir = g_build_filename (profile_root, ".config", (char *) NULL);
mc_config_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror);
g_free (dir);
dir = g_build_filename (mc_home, ".cache", (char *) NULL);
dir = g_build_filename (profile_root, ".cache", (char *) NULL);
mc_cache_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror);
g_free (dir);
dir = g_build_filename (mc_home, ".local", "share", (char *) NULL);
dir = g_build_filename (profile_root, ".local", "share", (char *) NULL);
mc_data_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror);
g_free (dir);
}
@ -331,7 +360,7 @@ mc_config_init_config_paths (GError ** mcerror)
else
{
g_free (defined_userconf_dir);
dir = g_build_filename (mc_config_get_home_dir (), MC_USERCONF_DIR, (char *) NULL);
dir = g_build_filename (mc_config_get_profile_root (), MC_USERCONF_DIR, (char *) NULL);
}
mc_data_str = mc_cache_str = mc_config_str = mc_config_init_one_config_path (dir, "", mcerror);
@ -393,15 +422,11 @@ mc_config_get_home_dir (void)
if (homedir == NULL)
{
homedir = g_getenv ("MC_HOME");
/* Prior to GLib 2.36, g_get_home_dir() ignores $HOME, which is why
* we read it ourselves. As that function's documentation explains,
* using $HOME is good for compatibility with other programs and
* for running from test frameworks. */
if (homedir == NULL || *homedir == '\0')
homedir = g_getenv ("HOME");
else
mc_home = homedir;
homedir = g_getenv ("HOME");
if (homedir == NULL || *homedir == '\0')
homedir = g_get_home_dir ();
}

3
src/textconf.c
View File

@ -180,7 +180,8 @@ show_version (void)
void
show_datadirs_extended (void)
{
(void) printf ("%s %s\n", _("Root directory:"), mc_config_get_home_dir ());
(void) printf ("%s %s\n", _("Home directory:"), mc_config_get_home_dir ());
(void) printf ("%s %s\n", _("Profile root directory:"), mc_config_get_profile_root ());
(void) puts ("");
PRINTF_GROUP (_("System data"));