summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-22 07:59:05 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-22 07:59:05 -0400
commit8db978aa4cf216632581c629053fb90ed16de33d (patch)
tree58dc41e21b614992a6fd9896291b3717296aaba8 /src
parentaf70c4ff6d51a64bca4f11d7dd61bb29c96ef0b7 (diff)
include evil_private.h in last files, and disable symbolic links on Windows in a couple of files
Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8933
Diffstat (limited to 'src')
-rw-r--r--src/bin/efreet/efreetd_cache.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_windows.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_windows.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_module.c3
-rw-r--r--src/lib/eio/efl_io_model.c2
-rw-r--r--src/lib/eio/eio_dir.c2
-rw-r--r--src/lib/elua/io.c4
-rw-r--r--src/lib/emotion/emotion_modules.c5
8 files changed, 23 insertions, 1 deletions
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index f0c27ae1a4..4b801a8fc0 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -487,12 +487,14 @@ icon_changes_monitor_add(const struct stat *st, const char *path)
487 const char *monpath = path; 487 const char *monpath = path;
488 488
489 if (eina_hash_find(icon_change_monitors, path)) return; 489 if (eina_hash_find(icon_change_monitors, path)) return;
490#ifndef _WIN32
490 if (S_ISLNK(st->st_mode)) 491 if (S_ISLNK(st->st_mode))
491 { 492 {
492 realp = ecore_file_realpath(path); 493 realp = ecore_file_realpath(path);
493 if (!realp) return; 494 if (!realp) return;
494 monpath = realp; 495 monpath = realp;
495 } 496 }
497#endif
496 if (ecore_file_is_dir(monpath)) 498 if (ecore_file_is_dir(monpath))
497 { 499 {
498 mon = eio_monitor_add(monpath); 500 mon = eio_monitor_add(monpath);
@@ -513,12 +515,14 @@ desktop_changes_monitor_add(const struct stat *st, const char *path)
513 const char *monpath = path; 515 const char *monpath = path;
514 516
515 if (eina_hash_find(desktop_change_monitors, path)) return; 517 if (eina_hash_find(desktop_change_monitors, path)) return;
518#ifndef _WIN32
516 if (S_ISLNK(st->st_mode)) 519 if (S_ISLNK(st->st_mode))
517 { 520 {
518 realp = ecore_file_realpath(path); 521 realp = ecore_file_realpath(path);
519 if (!realp) return; 522 if (!realp) return;
520 monpath = realp; 523 monpath = realp;
521 } 524 }
525#endif
522 if (ecore_file_is_dir(monpath)) 526 if (ecore_file_is_dir(monpath))
523 { 527 {
524 mon = eio_monitor_add(monpath); 528 mon = eio_monitor_add(monpath);
diff --git a/src/lib/ecore_con/efl_net_dialer_windows.c b/src/lib/ecore_con/efl_net_dialer_windows.c
index bf6d525e36..a38633e5f0 100644
--- a/src/lib/ecore_con/efl_net_dialer_windows.c
+++ b/src/lib/ecore_con/efl_net_dialer_windows.c
@@ -9,6 +9,8 @@
9# include <config.h> 9# include <config.h>
10#endif 10#endif
11 11
12#include <evil_private.h> /* evil_format_message evil_last_error_get */
13
12#include "Ecore.h" 14#include "Ecore.h"
13#include "Ecore_Con.h" 15#include "Ecore_Con.h"
14#include "ecore_con_private.h" 16#include "ecore_con_private.h"
diff --git a/src/lib/ecore_con/efl_net_server_windows.c b/src/lib/ecore_con/efl_net_server_windows.c
index 454e87c547..4adea75ef5 100644
--- a/src/lib/ecore_con/efl_net_server_windows.c
+++ b/src/lib/ecore_con/efl_net_server_windows.c
@@ -6,6 +6,8 @@
6# include <config.h> 6# include <config.h>
7#endif 7#endif
8 8
9#include <evil_private.h> /* evil_format_message evil_last_error_get */
10
9#include "Ecore.h" 11#include "Ecore.h"
10#include "Ecore_Con.h" 12#include "Ecore_Con.h"
11#include "ecore_con_private.h" 13#include "ecore_con_private.h"
diff --git a/src/lib/ecore_evas/ecore_evas_module.c b/src/lib/ecore_evas/ecore_evas_module.c
index a6ce6bec51..2b5394b06f 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -224,7 +224,8 @@ _ecore_evas_available_engines_get(void)
224 const char *name; 224 const char *name;
225 225
226#ifdef _WIN32 226#ifdef _WIN32
227 EVIL_PATH_SEP_WIN32_TO_UNIX(info->path); 227 name = strrchr(info->path, '\\');
228 if (name) name++;
228#endif 229#endif
229 name = strrchr(info->path, '/'); 230 name = strrchr(info->path, '/');
230 if (name) name++; 231 if (name) name++;
diff --git a/src/lib/eio/efl_io_model.c b/src/lib/eio/efl_io_model.c
index 87d219cfb0..54dc6a2882 100644
--- a/src/lib/eio/efl_io_model.c
+++ b/src/lib/eio/efl_io_model.c
@@ -274,8 +274,10 @@ _efl_io_model_info_type_get(const Eina_File_Direct_Info *info, const Eina_Stat *
274 return EINA_FILE_BLK; 274 return EINA_FILE_BLK;
275 else if (S_ISFIFO(st->mode)) 275 else if (S_ISFIFO(st->mode))
276 return EINA_FILE_FIFO; 276 return EINA_FILE_FIFO;
277#ifndef _WIN32
277 else if (S_ISLNK(st->mode)) 278 else if (S_ISLNK(st->mode))
278 return EINA_FILE_LNK; 279 return EINA_FILE_LNK;
280#endif
279#ifdef S_ISSOCK 281#ifdef S_ISSOCK
280 else if (S_ISSOCK(st->mode)) 282 else if (S_ISSOCK(st->mode))
281 return EINA_FILE_SOCK; 283 return EINA_FILE_SOCK;
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 22544c9df7..0ae68befde 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -95,8 +95,10 @@ _eio_file_recursiv_ls(Ecore_Thread *thread,
95 if (_eio_lstat(info->path, &buffer) != 0) 95 if (_eio_lstat(info->path, &buffer) != 0)
96 continue; 96 continue;
97 97
98#ifndef _WIN32
98 if (S_ISLNK(buffer.st_mode)) 99 if (S_ISLNK(buffer.st_mode))
99 info->type = EINA_FILE_LNK; 100 info->type = EINA_FILE_LNK;
101#endif
100 default: 102 default:
101 break; 103 break;
102 } 104 }
diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c
index 186170b87c..77ac3df94c 100644
--- a/src/lib/elua/io.c
+++ b/src/lib/elua/io.c
@@ -1,5 +1,9 @@
1#include "elua_private.h" 1#include "elua_private.h"
2 2
3#ifdef _WIN32
4# include <evil_private.h> /* realpath */
5#endif
6
3/* expand fname to full path name (so that PATH is ignored) plus turn 7/* expand fname to full path name (so that PATH is ignored) plus turn
4 * stuff into a command, and also verify whether the path exists */ 8 * stuff into a command, and also verify whether the path exists */
5static char * 9static char *
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 5f079b2983..da665e7aa4 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -2,6 +2,11 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6/* normally, they will never be called as it's for Wayland */
7# include <evil_private.h> /* setenv unsetenv */
8#endif
9
5#include "emotion_private.h" 10#include "emotion_private.h"
6#include "../../static_libs/buildsystem/buildsystem.h" 11#include "../../static_libs/buildsystem/buildsystem.h"
7#include <unistd.h> 12#include <unistd.h>