Changeset 2320Tweet

Timestamp:

04/26/08 14:24:57 (5 years ago)

Author:

sam

Message:

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

Location:

zzuf/trunk

Files:

• .gitignore (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/zzuf.1 (modified) (1 diff)
• src/lib-fd.c (modified) (2 diffs)

zzuf/trunk/.gitignore

@@ -19 +19 @@
 stamp-*
 *-stamp
+src/zzuf
+test/zzcat

zzuf/trunk/configure.ac

@@ -30 +30 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
-AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 fseeko _IO_getc getline getdelim __getdelim fgetln __srefill map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize)
+AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 dup dup2 fseeko _IO_getc getline getdelim __getdelim fgetln __srefill map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize)
 
 AC_CHECK_TYPES(sighandler_t, [], [],

zzuf/trunk/doc/zzuf.1

@@ -410 +410 @@
 .TP
 Unix file descriptor handling:
-\fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \fBreadv\fR(), \fBpread\fR(),
-\fBaccept\fR(), \fBsocket\fR(), \fBrecv\fR(), \fBrecvfrom\fR(), \fBrecvmsg\fR(),
-\fBaio_read\fR(), \fBaio_return\fR(), \fBclose\fR()
+\fBopen\fR(), \fBdup\fR(), \fBdup2\fR(), \fBlseek\fR(), \fBread\fR(),
+\fBreadv\fR(), \fBpread\fR(), \fBaccept\fR(), \fBsocket\fR(), \fBrecv\fR(),
+\fBrecvfrom\fR(), \fBrecvmsg\fR(), \fBaio_read\fR(), \fBaio_return\fR(),
+\fBclose\fR()
 .TP
 Standard IO streams:

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)