[EGIT] [core/elementary] master 02/03: Elm_Config: add getpwent support, fix compilation on Windows

[Vincent Torri]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=ed1e9026ff047e5782edfee998a07ae777cef917

commit ed1e9026ff047e5782edfee998a07ae777cef917
Author: Vincent Torri <vincent.to...@gmail.com>
Date:   Wed Jul 22 16:27:49 2015 +0200

    Elm_Config: add getpwent support, fix compilation on Windows
    
    @fix
---
 configure.ac         | 2 +-
 src/lib/elm_config.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 603535b..5e51522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,7 +447,7 @@ ELM_QUICKLAUNCH
 
 AC_FUNC_ALLOCA
 
-AC_CHECK_FUNCS([geteuid getuid])
+AC_CHECK_FUNCS([geteuid getuid getpwent])
 
 if test "x${want_quicklaunch}" != "xno"; then
    AC_CHECK_FUNCS([fork clearenv])
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 9e48af5..b389ce7 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -574,19 +574,21 @@ _elm_config_user_dir_snprintf(char       *dst,
 #if !defined(HAVE_GETUID) || !defined(HAVE_GETEUID)
    else
      {
+# if HAVE_GETPWENT
         struct passwd *pw = getpwent();
 
         if ((!pw) || (!pw->pw_dir)) goto end;
-#ifdef DOXDG
+#  ifdef DOXDG
         user_dir_len = eina_str_join_len
           (dst, size, '/', pw->pw_dir, strlen(pw->pw_dir),
            ".config", sizeof(".config") - 1,
            "elementary", sizeof("elementary") - 1);
-#else
+#  else
         user_dir_len = eina_str_join_len
           (dst, size, '/', pw->pw_dir, strlen(pw->pw_dir),
            ELEMENTARY_BASE_DIR, sizeof(ELEMENTARY_BASE_DIR) - 1);
-#endif
+#  endif
+# endif /* HAVE_GETPWENT */
      }
 #endif
 

--