Optimize new dircache_copy_path so that the helper (strlcat) doesn't need to walk through the entire string repeatedly.

Also fix a off-by-one.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30039 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 3 deletions

diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index bff9c2f..5d280c4 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -1077,11 +1077,12 @@ struct dirinfo* _dircache_get_entry_dirinfo(int id)
  * (or, in case of truncation, the position of the nul byte */
 static size_t copy_path_helper(const struct dircache_entry *entry, char *buf, size_t size)
 {
+    int offset = 1;
     /* has parent? */
     if (entry->up)
-        copy_path_helper(entry->up, buf, size);
+        offset += copy_path_helper(entry->up, buf, size);
 
-    size_t len = strlcat(buf, entry->d_name, size);
+    size_t len = strlcpy(buf+offset, entry->d_name, size - offset) + offset;
     if (len < size)
     {
         buf[len++] = '/';
@@ -1101,7 +1102,7 @@ size_t dircache_copy_path(int index, char *buf, size_t size)
         return 0;
 
     buf[0] = '/';
-    size_t res = copy_path_helper(&dircache_root[index], buf, size);
+    size_t res = copy_path_helper(&dircache_root[index], buf, size - 1);
     /* fixup trailing '/' */
     buf[res] = '\0';
     return res;