From 5cec7beb53f0feaa3f07756a0fee673d2aead1f3 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Mon, 8 Nov 2010 18:09:25 +0000
Subject: [PATCH] 	* efreet: little speedup for icon lookup.

	But really you should not call it as it will call stat for
	every path it guess an icon could be in. For example, elementary_test
	Toolbar 5 trigger 41132 call to stat on random place on your harddrive.


SVN revision: 54339
---
 legacy/efreet/src/lib/efreet_icon.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c
index 084554d274..3530e22c7c 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/legacy/efreet/src/lib/efreet_icon.c
@@ -719,16 +719,20 @@ efreet_icon_lookup_directory(Efreet_Icon_Theme *theme,
                              const char *icon_name)
 {
     Eina_List *l;
-    char *icon;
+    char *icon = NULL;
     const char *path;
+    const char *tmp;
+
+    tmp = eina_stringshare_add(icon_name);
 
     EINA_LIST_FOREACH(theme->paths, l, path)
     {
-        icon = efreet_icon_lookup_directory_helper(dir, path, icon_name);
-        if (icon) return icon;
+        icon = efreet_icon_lookup_directory_helper(dir, path, tmp);
+        if (icon) break;
     }
 
-    return NULL;
+    eina_stringshare_del(tmp);
+    return icon;
 }
 
 /**
@@ -928,14 +932,22 @@ efreet_icon_lookup_directory_helper(Efreet_Icon_Theme_Directory *dir,
     Eina_List *l;
     char *icon = NULL;
     char file_path[PATH_MAX];
-    const char *ext, *path_strs[] = { path, "/", dir->name, "/", icon_name, NULL };
+    const char *ext;
     size_t len;
 
-    len = efreet_array_cat(file_path, sizeof(file_path), path_strs);
+    /* build "$(path)/$(dir->name)/$(icon_name) */
+    len = eina_stringshare_strlen(path);
+    memcpy(file_path, path, len);
+    file_path[len++] = '/';
+    memcpy(file_path + len, dir->name, eina_stringshare_strlen(dir->name));
+    len += eina_stringshare_strlen(dir->name);
+    file_path[len++] = '/';
+    memcpy(file_path + len, icon_name, eina_stringshare_strlen(icon_name));
+    len += eina_stringshare_strlen(icon_name);
 
     EINA_LIST_FOREACH(efreet_icon_extensions, l, ext)
     {
-        eina_strlcpy(file_path + len, ext, sizeof(file_path) - len);
+        memcpy(file_path + len, ext, eina_stringshare_strlen(ext) + 1);
 
         if (ecore_file_exists(file_path))
         {