ObtPaths *p;
const gchar *path;
- p = g_new0(ObtPaths, 1);
+ p = g_slice_new0(ObtPaths);
p->ref = 1;
path = g_getenv("XDG_CONFIG_HOME");
g_free(p->data_home);
g_free(p->cache_home);
- obt_free0(p, ObtPaths, 1);
+ g_slice_free(ObtPaths, p);
}
}
gchar *obt_paths_expand_tilde(const gchar *f)
{
- gchar **spl;
gchar *ret;
+ GRegex *regex;
if (!f)
return NULL;
- spl = g_strsplit(f, "~", 0);
- ret = g_strjoinv(g_get_home_dir(), spl);
- g_strfreev(spl);
+
+ regex = g_regex_new("(?:^|(?<=[ \\t]))~(?=[/ \\t$])", G_REGEX_MULTILINE | G_REGEX_RAW, 0, NULL);
+ ret = g_regex_replace_literal(regex, f, -1, 0, g_get_home_dir(), 0, NULL);
+ g_regex_unref(regex);
+
return ret;
}