c8h4/imv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Resolve path in imv_navigator_find_path()

Browse source 
All items' pathes are resolved in add_item() so path used in imv_navigator_find_path() should be resolved too. This patch fixes #308
This commit is contained in:
Aleksander Szczygieł 2021-01-20 18:13:06 +01:00 committed by Harry Jeffery
parent 478310d0c6
commit ff0b802c03
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/navigator.c
View file

@ -255,15 +255,21 @@ void imv_navigator_remove_all(struct imv_navigator *nav)
ssize_t imv_navigator_find_path(struct imv_navigator *nav, const char *path)
{
/* first try to match the exact path */
for (size_t i = 0; i < nav->paths->len; ++i) {
struct nav_item *item = nav->paths->items[i];
if (!strcmp(item->path, path)) {
return (ssize_t)i;
char *real_path = realpath(path, NULL);
if (real_path) {
/* first try to match the exact path if path can be resolved */
for (size_t i = 0; i < nav->paths->len; ++i) {
struct nav_item *item = nav->paths->items[i];
if (!strcmp(item->path, real_path)) {
free(real_path);
return (ssize_t)i;
}
}
free(real_path);
}
/* no exact matches, try the final portion of the path */
/* no exact matches or path cannot be resolved, try the final portion of the path */
for (size_t i = 0; i < nav->paths->len; ++i) {
struct nav_item *item = nav->paths->items[i];
char *last_sep = strrchr(item->path, '/');