From 2dc72f971b1a9b4703b3f527af99a3105dfa990d Mon Sep 17 00:00:00 2001
From: Rajko Stojadinovic <admin@rajko.info>
Date: Sat, 7 Jul 2018 13:51:19 +0200
Subject: [PATCH] Only add / when joining paths when necessary

---
 common/menu-list.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/menu-list.c b/common/menu-list.c
index 7e98819..8f4295d 100644
--- a/common/menu-list.c
+++ b/common/menu-list.c
@@ -103,8 +103,13 @@ int menuScan(const char* target) {
 
         bool entrytype=0;
 
-        memset(tmp_path, 0, sizeof(tmp_path));
-        snprintf(tmp_path, sizeof(tmp_path)-1, "%s%s", s_menu[!s_curMenu].dirname, dp->d_name);
+        size_t pathLen = strlen(s_menu[!s_curMenu].dirname);
+        strncpy(tmp_path, s_menu[!s_curMenu].dirname, sizeof(tmp_path));
+        if (pathLen > 0 && tmp_path[pathLen-1] != '/') {
+            tmp_path[pathLen++] = '/';
+            tmp_path[pathLen] = 0;
+        }
+        strncpy(&tmp_path[pathLen], dp->d_name, sizeof(tmp_path)-pathLen-1);
 
         #ifdef __SWITCH__
         fsdev_dir_t* dirSt = (fsdev_dir_t*)dir->dirData->dirStruct;