shithub: mc

Info  •  Files  •  Log  •  Branches

Fix std.pathnorm for empty strings.

    The normalized version of "" should be ".", not "/". Make
    it so.

--- a/libstd/pathjoin.myr

+++ b/libstd/pathjoin.myr

@@ -20,7 +20,9 @@

 const pathjoin = {l

 	var p, q

-	p = strjoin(l, "/")

+	if l.len > 0

+		p = strjoin(l, "/")

+	;;

 	q = pathnorm(p)

 	slfree(p)

 	-> q

--- a/test/data/stdpathnorm-expected

+++ b/test/data/stdpathnorm-expected

@@ -1,3 +1,4 @@

+.

 foo

 foo/bar

 /foo/bar

--- a/test/stdpathnorm.myr

+++ b/test/stdpathnorm.myr

@@ -2,6 +2,7 @@

 const main = {

 	/* untouched */

+	std.put("%s\n", std.pathnorm(""))

 	std.put("%s\n", std.pathnorm("foo"))

 	std.put("%s\n", std.pathnorm("foo/bar"))

 	std.put("%s\n", std.pathnorm("/foo/bar"))

-- 

⑨