Fixed removal of links on Unix-like OSes, updated tests against future regressions

Author: nickclark2016

src/host/os_islink.c

@@ -31,7 +31,8 @@ int os_islink(lua_State* L)
 #else
 	{
 		struct stat buf;
-		if (lstat(path, &buf) == 0) {
+		if (lstat(path, &buf) == 0)
+		{
 			lua_pushboolean(L, S_ISLNK(buf.st_mode));
 			return 1;
 		}

src/host/os_remove.c

@@ -1,9 +1,10 @@
 /**
  * \file   os_remove.c
- * \brief  Remove a file on Windows.
+ * \brief  Remove a file or symlink to a file.
  * \author Copyright (c) 2002-2013 Jess Perkins and the Premake project
  */
 
+#include <sys/stat.h>
 #include "premake.h"
 
 #if PLATFORM_WINDOWS
@@ -48,4 +49,45 @@ int os_remove(lua_State* L)
 	}
 }
 
+#else
+
+int os_remove(lua_State* L)
+{
+	const char* filename = luaL_checkstring(L, 1);
+	
+	struct stat buf;
+	if (lstat(filename, &buf) == 0 && S_ISLNK(buf.st_mode))
+	{
+		int res = unlink(filename);
+		if (res == 0)
+		{
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+		else
+		{
+			lua_pushnil(L);
+			lua_pushfstring(L, "Unable to unlink file '%s'", filename);
+			lua_pushinteger(L, res);
+			return 3;
+		}
+	}
+	else
+	{
+		int res = remove(filename);
+		if (res == 0)
+		{
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+		else
+		{
+			lua_pushnil(L);
+			lua_pushfstring(L, "Unable to remove file '%s'", filename);
+			lua_pushinteger(L, res);
+			return 3;
+		}
+	}
+}
+
 #endif

src/host/os_rmdir.c

@@ -4,6 +4,7 @@
  * \author Copyright (c) 2002-2013 Jess Perkins and the Premake project
  */
 
+#include <sys/stat.h>
 #include <stdlib.h>
 #include "premake.h"
 
@@ -23,7 +24,15 @@ int os_rmdir(lua_State* L)
 
 	z = RemoveDirectoryW(wide_path);
 #else
-	z = (0 == rmdir(path));
+	struct stat buf;
+	if (lstat(path, &buf) == 0 && S_ISLNK(buf.st_mode))
+	{
+		z = (0 == unlink(path));
+	}
+	else
+	{
+		z = (0 == rmdir(path));
+	}
 #endif
 
 	if (!z)

src/host/premake.c

@@ -85,10 +85,10 @@ static const luaL_Reg os_functions[] = {
 	{ "matchnext",              os_matchnext            },
 	{ "matchstart",             os_matchstart           },
 	{ "mkdir",                  os_mkdir                },
+	{ "remove",                 os_remove               },
 #if PLATFORM_WINDOWS
 	// utf8 functions for Windows (assuming posix already handle utf8)
-	{"remove",                  os_remove               },
-	{"rename",                  os_rename               },
+	{ "rename",                 os_rename               },
 #endif
 	{ "pathsearch",             os_pathsearch           },
 	{ "realpath",               os_realpath             },

src/host/premake.h

@@ -156,9 +156,9 @@ int os_matchstart(lua_State* L);
 int os_mkdir(lua_State* L);
 int os_pathsearch(lua_State* L);
 int os_realpath(lua_State* L);
+int os_remove(lua_State* L);
 #if PLATFORM_WINDOWS
 // utf8 versions
-int os_remove(lua_State* L);
 int os_rename(lua_State* L);
 #endif
 int os_rmdir(lua_State* L);

tests/base/test_os.lua

@@ -69,17 +69,18 @@
 	function suite.linkdir()
 		test.istrue(os.linkdir("folder/subfolder", "folder/subfolder2"))
 		test.istrue(os.islink("folder/subfolder2"))
-		os.rmdir("folder/subfolder2")
+		test.istrue(os.rmdir("folder/subfolder2"))
+		test.isfalse(os.islink("folder/subfolder2"))
 	end
 
 	function suite.linkfile()
 		test.istrue(os.linkfile("folder/ok.lua", "folder/ok2.lua"))
 		test.istrue(os.islink("folder/ok2.lua"))
-		os.remove("folder/ok2.lua")
+		test.istrue(os.remove("folder/ok2.lua"))
+		test.isfalse(os.islink("folder/ok2.lua"))
 	end
 
 
-
 --
 -- os.matchdirs() tests
 --