From be17392520a09e7aeb25300dfa72b38b209f7cf3 Mon Sep 17 00:00:00 2001 From: Chidambar Zinnoury Date: Sun, 3 Oct 2010 15:08:18 +0000 Subject: [PATCH] eina: strrchr--. SVN revision: 53000 --- legacy/eina/src/lib/eina_module.c | 44 +++++++++++++++++-------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c index 4e7a06a1f1..7ae4bdbd6b 100644 --- a/legacy/eina/src/lib/eina_module.c +++ b/legacy/eina/src/lib/eina_module.c @@ -502,28 +502,32 @@ EAPI char *eina_module_symbol_path_get(const void *symbol, const char *sub_dir) EINA_SAFETY_ON_NULL_RETURN_VAL(symbol, NULL); if (dladdr(symbol, &eina_dl)) - if (strrchr(eina_dl.dli_fname, '/')) - { - char *path; - int l0; - int l1; - int l2 = 0; + { + char *pos = strrchr(eina_dl.dli_fname, '/'); + if (pos) + { + char *path; + int l0; + int l1; + int l2 = 0; - l0 = strlen(eina_dl.dli_fname); - l1 = strlen(strrchr(eina_dl.dli_fname, '/')); - if (sub_dir && (*sub_dir != '\0')) - l2 = strlen(sub_dir); + l0 = strlen(eina_dl.dli_fname); + l1 = strlen(pos); + if (sub_dir && (*sub_dir != '\0')) + l2 = strlen(sub_dir); - path = malloc(l0 - l1 + l2 + 1); - if (path) - { - memcpy(path, eina_dl.dli_fname, l0 - l1); - if (sub_dir && (*sub_dir != '\0')) - memcpy(path + l0 - l1, sub_dir, l2); - path[l0 - l1 + l2] = '\0'; - return path; - } - } + path = malloc(l0 - l1 + l2 + 1); + if (path) + { + memcpy(path, eina_dl.dli_fname, l0 - l1); + if (sub_dir && (*sub_dir != '\0')) + memcpy(path + l0 - l1, sub_dir, l2); + + path[l0 - l1 + l2] = '\0'; + return path; + } + } + } #endif /* ! HAVE_DLADDR */