devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=7a40e971b1104ee8ee468d82ddeb370fbd1659a3
commit 7a40e971b1104ee8ee468d82ddeb370fbd1659a3
Author: Vincent Torri <vincent.to...@gmail.com>
Date: Tue Aug 11 08:33:09 2015 +0200
Do not use Evil functions to get home and tmp directories
Use Eina ones instead
---
src/bin/utils.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/bin/utils.c b/src/bin/utils.c
index e112f1e..282b6f7 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -550,10 +550,7 @@ _homedir_get(char *buf, size_t size)
{
const char *home;
-#ifdef _WIN32
- home = evil_homedir_get();
-#else
-# if defined (HAVE_GETUID) && defined(HAVE_GETEUID)
+#if defined (HAVE_GETUID) && defined(HAVE_GETEUID)
if (getuid() != geteuid())
{
struct passwd *pw;
@@ -562,18 +559,11 @@ _homedir_get(char *buf, size_t size)
if ((pw) && (pw->pw_dir)) home = pw->pw_dir;
}
else
-# endif
- home = getenv("HOME");
#endif
+ home = eina_environment_home_get();
- if ((!home) || (home[0] == '\0'))
- {
-#ifdef _WIN32
- home = evil_tmpdir_get();
-#else
- home = "/tmp";
-#endif
- }
+ if ((!home) || !*home)
+ eina_environment_tmp_get();
return eina_strlcpy(buf, home, size) < size;
}
--
