Fix for JoeStrout#157

borgi · Nov 21, 2024 · 8b5dfea · 8b5dfea
1 parent f0b65c6
commit 8b5dfea
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/MiniScript-cpp/src/ShellIntrinsics.cpp b/MiniScript-cpp/src/ShellIntrinsics.cpp
@@ -336,8 +336,12 @@ static IntrinsicResult intrinsic_basename(Context *context, IntrinsicResult part
 		char extBuf[256];
 		_splitpath_s(pathStr.c_str(), driveBuf, sizeof(driveBuf), nullptr, 0, nameBuf, sizeof(nameBuf), extBuf, sizeof(extBuf));
 		String result = String(nameBuf) + String(extBuf);
-    #else
+	#elif defined(__APPLE__) || defined(__FreeBSD__)
 		String result(basename((char*)pathStr.c_str()));
+	#else
+		char *duplicate = strdup((char*)pathStr.c_str());
+		String result(basename(duplicate));
+		free(duplicate);
 	#endif
 	return IntrinsicResult(result);
 }

diff --git a/MiniScript-cpp/tests/testFileName.ms b/MiniScript-cpp/tests/testFileName.ms
@@ -0,0 +1,12 @@
+import "qa"
+
+testDir = "tests/"
+
+testFileName = function
+	p = "a/b/"
+	n = file.name(p)
+	qa.assertEqual n, "b"
+	qa.assertEqual p, "a/b/"
+end function
+
+if refEquals(locals, globals) then testFileName