Changeset 5058

Timestamp:

07/11/09 09:01:32 (4 years ago)

Author:

Cyrus

Message:

nixio: Fix accidental closing of file descriptors after dup with two
parameters resulting in strange behaviour when spawning processes

Files:

• luci/trunk/libs/nixio/src/file.c (modified) (1 diff)

luci/trunk/libs/nixio/src/file.c

@@ -124 +124 @@
         return nixio__perror(L);
     } else {
-        int *udata = lua_newuserdata(L, sizeof(int));
-        if (!udata) {
-            return luaL_error(L, "out of memory");
-        }
-
-        *udata = stat;
-        luaL_getmetatable(L, NIXIO_FILE_META);
-        lua_setmetatable(L, -2);
+        if (newfd == -1) {
+            int *udata = lua_newuserdata(L, sizeof(int));
+            if (!udata) {
+                return luaL_error(L, "out of memory");
+            }
+
+            *udata = stat;
+            luaL_getmetatable(L, NIXIO_FILE_META);
+            lua_setmetatable(L, -2);
+        } else {
+            lua_pushvalue(L, 2);
+        }
         return 1;
     }