Changeset 2320 for zzuf/trunk/src/lib-fd.cTweet

Timestamp:

Apr 26, 2008, 2:24:57 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Implement dup() and dup2(). They are needed for Debian's implementation of dd which otherwise causes the regression tests to fail.

File:

• zzuf/trunk/src/lib-fd.c (modified) (2 diffs)

zzuf/trunk/src/lib-fd.c

@@ -81 +81 @@
 #if defined HAVE_OPEN64
 static int     (*ORIG(open64))  (const char *file, int oflag, ...);
+#endif
+#if defined HAVE_DUP
+static int     (*ORIG(dup))     (int oldfd);
+#endif
+#if defined HAVE_DUP2
+static int     (*ORIG(dup2))    (int oldfd, int newfd);
 #endif
 #if defined HAVE_ACCEPT
@@ -172 +178 @@
 #endif
 
+#if defined HAVE_DUP
+int NEW(dup)(int oldfd)
+{
+    int ret;
+
+    LOADSYM(dup);
+    ret = ORIG(dup)(oldfd);
+    if(!_zz_ready || _zz_islocked(-1) || !_zz_iswatched(oldfd)
+         || !_zz_isactive(oldfd))
+        return ret;
+
+    if(ret >= 0)
+    {
+        debug("%s(%i) = %i", __func__, oldfd, ret);
+        _zz_register(ret);
+    }
+
+    return ret;
+}
+#endif
+
+#if defined HAVE_DUP2
+int NEW(dup2)(int oldfd, int newfd)
+{
+    int ret;
+
+    LOADSYM(dup2);
+    ret = ORIG(dup2)(oldfd, newfd);
+    if(!_zz_ready || _zz_islocked(-1) || !_zz_iswatched(oldfd)
+         || !_zz_isactive(oldfd))
+        return ret;
+
+    if(ret >= 0)
+    {
+        /* We must close newfd if it was open, but only if oldfd != newfd
+         * and if dup2() suceeded. */
+        if(oldfd != newfd && _zz_iswatched(newfd) && _zz_isactive(newfd))
+            _zz_unregister(newfd);
+
+        debug("%s(%i, %i) = %i", __func__, oldfd, newfd, ret);
+        _zz_register(ret);
+    }
+
+    return ret;
+}
+#endif
+
 #if defined HAVE_ACCEPT
 int NEW(accept)(int sockfd, struct sockaddr *addr, SOCKLEN_T *addrlen)