q66
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_con: use portable environment lookup.

This commit is contained in:
Cedric BAIL 2015-05-14 18:40:47 +02:00
parent 9e2f846830
commit 94eaaf889b
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/ecore_con/ecore_con_local.c
View File

@ -37,20 +37,11 @@
static int _ecore_con_local_init_count = 0;
static inline const char *_ecore_con_get_tmpdir()
{
const char *tmpdir = "/tmp";
const char *dir = getenv("TMPDIR");
if (!dir) return tmpdir;
return dir;
}
static const char *_ecore_con_local_path_get()
{
const char *homedir = getenv("XDG_RUNTIME_DIR");
if (!homedir) homedir = getenv("HOME");
if (!homedir) homedir = _ecore_con_get_tmpdir();
if (!homedir) homedir = eina_environment_home_get();
if (!homedir) homedir = eina_environment_tmp_get();
return homedir;
}
@ -124,7 +115,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
}
else
{
homedir = _ecore_con_get_tmpdir();
homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), "%s/.ecore_service|%s",
homedir, svr->name);
}
@ -135,7 +126,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
snprintf(buf, sizeof(buf), "%s|%i", svr->name, svr->port);
else
{
homedir = _ecore_con_get_tmpdir();
homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), "%s/.ecore_service|%s|%i",
homedir, svr->name, svr->port);
}
@ -285,7 +276,7 @@ ecore_con_local_listen(
}
else
{
homedir = _ecore_con_get_tmpdir();
homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), "%s/.ecore_service|%s",
homedir, svr->name);
}
@ -296,7 +287,7 @@ ecore_con_local_listen(
snprintf(buf, sizeof(buf), "%s|%i", svr->name, svr->port);
else
{
homedir = _ecore_con_get_tmpdir();
homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), "%s/.ecore_service|%s|%i",
homedir, svr->name, svr->port);
}