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

Timestamp:

Oct 7, 2007, 7:09:24 PM (18 years ago)

Author:

bird

Message:

jobs and other stuff.

File:

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

trunk/src/kash/redir.c

@@ -138 +138 @@
                         INTOFF;
 again:
-                        if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+                        if ((i = shfile_fcntl(&psh->fdtab, fd, F_DUPFD, 10)) == -1) {
                                 switch (errno) {
                                 case EBADF:
@@ -155 +155 @@
                         if (!try) {
                                 sv->renamed[fd] = i;
-                                close(fd);
+                                shfile_close(&psh->fdtab, fd);
                         }
                         INTON;
                 } else {
-                        close(fd);
+                        shfile_close(&psh->fdtab, fd);
                 }
                 if (fd == 0)
@@ -198 +198 @@
                         goto eopen;
                 if (eflags)
-                        (void)fcntl(f, F_SETFL, fcntl(f, F_GETFL, 0) & ~eflags);
+                        (void)shfile_fcntl(&psh->fdtab, f, F_SETFL, shfile_fcntl(&psh->fdtab, f, F_GETFL, 0) & ~eflags);
                 break;
         case NFROMTO:
@@ -272 +272 @@
         }
         if (forkshell(psh, (struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
-                close(pip[0]);
+                shfile_close(&psh->fdtab, pip[0]);
                 signal(SIGINT, SIG_IGN);
                 signal(SIGQUIT, SIG_IGN);
@@ -287 +287 @@
         }
 out:
-        close(pip[1]);
+        shfile_close(&psh->fdtab, pip[1]);
         return pip[0];
 }
@@ -359 +359 @@
                 for (i = 0 ; i < 10 ; i++) {
                         if (rp->renamed[i] >= 0) {
-                                close(rp->renamed[i]);
+                                shfile_close(&psh->fdtab, rp->renamed[i]);
                         }
                         if (!vforked)