From 5d9b26f6a29e9c429f4f1f09ce0762f2d04023c7 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 14 Aug 2012 17:24:00 +0200 Subject: folder_select: fix problem when selecting / as folder. Change-Id: Id4880267e8478cebe073b958a58fef1ac22dd336 --- apps/gui/folder_select.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/gui/folder_select.c b/apps/gui/folder_select.c index 05354c4c6c..f2830fb8fd 100644 --- a/apps/gui/folder_select.c +++ b/apps/gui/folder_select.c @@ -103,9 +103,13 @@ static char* get_full_path(struct folder *start) { static char buffer[MAX_PATH]; - buffer[0] = '\0'; - - get_full_path_r(start, buffer); + if (strcmp(start->name, "/")) + { + buffer[0] = 0; + get_full_path_r(start, buffer); + } + else /* get_full_path_r() does the wrong thing for / */ + return "/"; return buffer; } @@ -447,8 +451,12 @@ static void save_folders_r(struct folder *root, char* dst, size_t maxlen) snprintf(buffer_front, buffer_end - buffer_front, "%s:", get_full_path(this->folder)); else + { + char *p = get_full_path(root); snprintf(buffer_front, buffer_end - buffer_front, - "%s/%s:", get_full_path(root), this->name); + "%s/%s:", strcmp(p, "/") ? p : "", + strcmp(this->name, "/") ? this->name : ""); + } strlcat(dst, buffer_front, maxlen); } else if (this->state == EXPANDED) -- cgit v1.2.3