Changeset 2424 for trunk/src/kash/redir.c

Timestamp:

Oct 18, 2010, 10:52:03 AM (15 years ago)

Author:

bird

Message:

kash: Some S-bahn optimizations.

File:

• trunk/src/kash/redir.c (modified) (5 diffs)

trunk/src/kash/redir.c

@@ -233 +233 @@
 
         if (f != fd) {
-                copyfd(psh, f, fd);
-                shfile_close(&psh->fdtab, f);
+                movefd(psh, f, fd);
         }
         INTON;
@@ -302 +301 @@
                         if (i == 0)
                                 psh->fd0_redirected--;
-                        shfile_close(&psh->fdtab, i);
                         if (rp->renamed[i] >= 0) {
-                                copyfd(psh, rp->renamed[i], i);
-                                shfile_close(&psh->fdtab, rp->renamed[i]);
+                                movefd(psh, rp->renamed[i], i);
+                        } else {
+                                shfile_close(&psh->fdtab, i);
                         }
                 }
@@ -378 +377 @@
                 if (errno == EMFILE)
                         return EMPTY;
-                else
-                        error(psh, "%d: %s", from, strerror(errno));
+                error(psh, "%d: %s", from, strerror(errno));
         }
         return newfd;
@@ -386 +384 @@
 
 /*
- * Copy a file descriptor to be = to.  Returns -1
+ * Move a file descriptor to be == to.  Returns -1
  * if the source file descriptor is closed, EMPTY if there are no unused
  * file descriptors left.
@@ -392 +390 @@
 
 int
-copyfd2(shinstance *psh, int from, int to)
+movefd(shinstance *psh, int from, int to)
 {
         int newfd;
 
-        /** @todo Use dup2()... */
-        newfd = shfile_fcntl(&psh->fdtab, from, F_DUPFD, to);
+        newfd = shfile_movefd(&psh->fdtab, from, to);
         if (newfd < 0) {
                 if (errno == EMFILE)
                         return EMPTY;
-                else
-                        error(psh, "%d: %s", from, strerror(errno));
-        }
-        else if (newfd != to) {
-                error(psh, "%d: F_DUPFD returned %d, expected %d", from, newfd, to);
-                close(newfd);
-                newfd = -1;
-        }
-
+                error(psh, "%d: %s", from, strerror(errno));
+        }
         return newfd;
 }
 
+
+/*
+ * Move a file descriptor to be >= to.  Returns -1
+ * if the source file descriptor is closed, EMPTY if there are no unused
+ * file descriptors left.
+ */
+
+int
+movefd_above(shinstance *psh, int from, int to)
+{
+        int newfd;
+
+        newfd = shfile_movefd_above(&psh->fdtab, from, to);
+        if (newfd < 0) {
+                if (errno == EMFILE)
+                        return EMPTY;
+                error(psh, "%d: %s", from, strerror(errno));
+        }
+        return newfd;
+}
+