LuaFAR: change win.JoinPath a little (touch #77)

shmuz · Nov 5, 2024 · d68c867 · d68c867
1 parent f7ab02a
commit d68c867
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/luafar/manuals/luafar2m_manual.chm b/luafar/manuals/luafar2m_manual.chm
diff --git a/luafar/src/win.c b/luafar/src/win.c
@@ -529,9 +529,14 @@ static int win_JoinPath(lua_State *L)
 	luaL_buffinit(L, &buf);
 
 	for (idx=1; idx <= top; idx++) {
-		const char *s = luaL_optstring(L, idx, "");
-		if (*s == 0)
+		const char *s = luaL_checkstring(L, idx);
+		if (*s == 0) {
+			if (idx == top && !was_slash) { // treat empty string in last arg as delimiter
+				luaL_addchar(&buf, DELIM);
+				break;
+			}
 			continue;
+		}
 		if (!empty && !was_slash && *s != DELIM)
 			luaL_addchar(&buf, DELIM);
 		else if (was_slash && *s == DELIM)