From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 7 Jan 2022 12:12:04 +0000 (+0100)
Subject: e2lib: glibc-2.34 added closefrom() creating a collision
X-Git-Tag: e2factory-2.3.18p0~1
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=ef612e96adf1b69b5e260e157b98034b4c21cdb6;p=e2factory.git

e2lib: glibc-2.34 added closefrom() creating a collision

Rename our closefrom to do_closefrom.

We should switch to glibc closefrom once it's well established.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/generic/le2lib.c b/generic/le2lib.c
index 28b5cef..a291041 100644
--- a/generic/le2lib.c
+++ b/generic/le2lib.c
@@ -550,7 +550,7 @@ do_unlink(lua_State *lua)
 
 /* closes all file descriptors >= fd */
 static int
-closefrom(lua_State *L)
+do_closefrom(lua_State *L)
 {
 	DIR *d = NULL;
 	int myself, from, eno = 0;
@@ -952,7 +952,7 @@ do_forkpty(lua_State *L)
 static luaL_Reg lib[] = {
 	{ "chdir", change_directory },
 	{ "chmod", do_chmod },
-	{ "closefrom", closefrom },
+	{ "closefrom", do_closefrom },
 	{ "cwd", get_working_directory },
 	{ "directory", get_directory },
 	{ "execvp", do_execvp },