summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-01-08 22:06:41 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-01-08 22:06:41 +0900
commite8c13118eb39a3acaf70430951f7049c53799bae (patch)
tree3a91075c6e93f53c60cea3ebcb714575f0ce5b79 /src/lib/evas
parentb95ef3801f9719a8f8ff731e25d66a8d1dd417cd (diff)
fix mingw build for setuid fix/checks
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c8
-rw-r--r--src/lib/evas/file/evas_module.c12
2 files changed, 15 insertions, 5 deletions
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index 0afd91f3fa..ab6c30eeeb 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -128,7 +128,9 @@ _socket_path_set(char *path)
128 char *env; 128 char *env;
129 char buf[UNIX_PATH_MAX]; 129 char buf[UNIX_PATH_MAX];
130 130
131 if (getuid() == getuid()) 131#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
132 if (getuid() == geteuid())
133#endif
132 { 134 {
133 env = getenv("EVAS_CSERVE2_SOCKET"); 135 env = getenv("EVAS_CSERVE2_SOCKET");
134 if (env && env[0]) 136 if (env && env[0])
@@ -142,7 +144,9 @@ _socket_path_set(char *path)
142 /* FIXME: check we can actually create this socket */ 144 /* FIXME: check we can actually create this socket */
143 strcpy(path, buf); 145 strcpy(path, buf);
144#if 0 146#if 0
145 if (getuid() == getuid()) 147#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
148 if (getuid() == geteuid())
149#endif
146 { 150 {
147 env = getenv("XDG_RUNTIME_DIR"); 151 env = getenv("XDG_RUNTIME_DIR");
148 if (!env || !env[0]) 152 if (!env || !env[0])
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index 01bf0b0f1d..28b4243cdd 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -56,7 +56,9 @@ evas_module_paths_init(void)
56{ 56{
57 char *libdir, *path; 57 char *libdir, *path;
58 58
59 if (getuid() == getuid()) 59#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
60 if (getuid() == geteuid())
61#endif
60 { 62 {
61 if (getenv("EFL_RUN_IN_TREE")) 63 if (getenv("EFL_RUN_IN_TREE"))
62 { 64 {
@@ -326,7 +328,9 @@ evas_module_engine_list(void)
326 const char *fname = fi->path + fi->name_start; 328 const char *fname = fi->path + fi->name_start;
327 329
328 buf[0] = '\0'; 330 buf[0] = '\0';
329 if (getuid() == getuid()) 331#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
332 if (getuid() == geteuid())
333#endif
330 { 334 {
331 if (run_in_tree) 335 if (run_in_tree)
332 { 336 {
@@ -425,7 +429,9 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
425 } 429 }
426 430
427 buffer[0] = '\0'; 431 buffer[0] = '\0';
428 if (getuid() == getuid()) 432#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
433 if (getuid() == geteuid())
434#endif
429 { 435 {
430 if (run_in_tree) 436 if (run_in_tree)
431 { 437 {