]> git.e2factory.org Git - e2factory.git/commitdiff
e2lib: glibc-2.34 added closefrom() creating a collision
authorTobias Ulmer <tu@emlix.com>
Fri, 7 Jan 2022 12:12:04 +0000 (13:12 +0100)
committerTobias Ulmer <tu@emlix.com>
Mon, 10 Jan 2022 12:52:04 +0000 (13:52 +0100)
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>
generic/le2lib.c

index 28b5cef0e42799468e1702097ba385bce8e846b7..a291041acfbb331dffae26453efe420d84e30fcc 100644 (file)
@@ -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 },