1 files changed, 9 insertions, 13 deletions

diff --git a/libraries/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/libraries/ecore/src/lib/ecore_evas/ecore_evas_fb.c
index 3ee913e..74caada 100644
--- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_fb.c
+++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_fb.c
@@ -2,6 +2,7 @@
 # include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -154,9 +155,9 @@ _ecore_evas_fb_render(Ecore_Evas *ee)
    if (ee->visible)
      {
         Eina_List *updates;
-
         Eina_List *ll;
         Ecore_Evas *ee2;
+
         if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
 
         EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
@@ -184,31 +185,26 @@ _ecore_evas_fb_render(Ecore_Evas *ee)
 static int
 _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
 {
+   Eina_File_Direct_Info *info;
+   Eina_Iterator *ls;
    Ecore_Fb_Input_Device *device;
    Ecore_Fb_Input_Device_Cap caps;
    int mouse_handled = 0;
 
-   DIR *input_dir;
-   struct dirent *input_entry;
-
    _ecore_evas_init_count++;
    if (_ecore_evas_init_count > 1) return _ecore_evas_init_count;
 
    ecore_event_evas_init();
 
    /* register all input devices */
-   input_dir = opendir("/dev/input/");
-   if (!input_dir) return _ecore_evas_init_count;
+   ls = eina_file_direct_ls("/dev/input/");
 
-   while ((input_entry = readdir(input_dir)))
+   EINA_ITERATOR_FOREACH(ls, info)
      {
-        char device_path[256];
-
-        if (strncmp(input_entry->d_name, "event", 5) != 0)
+        if (strncmp(info->path + info->name_start, "event", 5) != 0)
           continue;
 
-        snprintf(device_path, 256, "/dev/input/%s", input_entry->d_name);
-        if (!(device = ecore_fb_input_device_open(device_path)))
+        if (!(device = ecore_fb_input_device_open(info->path)))
           continue;
         ecore_fb_input_device_window_set(device, ee);
 
@@ -240,7 +236,7 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
              ecore_evas_input_devices = eina_list_append(ecore_evas_input_devices, device);
           }
      }
-   closedir(input_dir);
+   eina_iterator_free(ls);
 
    if (!mouse_handled)
      {