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

Timestamp:

Oct 7, 2007, 2:24:15 AM (18 years ago)

Author:

bird

Message:

Added psh parameter to the remaining global functions.

File:

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

trunk/src/kash/redir.c

@@ -225 +225 @@
                                 memory[fd] = 1;
                         else
-                                copyfd(redir->ndup.dupfd, fd);
+                                copyfd(psh, redir->ndup.dupfd, fd);
                 }
                 INTON;
@@ -238 +238 @@
 
         if (f != fd) {
-                copyfd(f, fd);
-                close(f);
+                copyfd(psh, f, fd);
+                shfile_close(&psh->fdtab, f);
         }
         INTON;
@@ -271 +271 @@
                 }
         }
-        if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
+        if (forkshell(psh, (struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
                 close(pip[0]);
                 signal(SIGINT, SIG_IGN);
@@ -307 +307 @@
                         if (i == 0)
                                 fd0_redirected--;
-                        close(i);
+                        shfile_close(&psh->fdtab, i);
                         if (rp->renamed[i] >= 0) {
-                                copyfd(rp->renamed[i], i);
-                                close(rp->renamed[i]);
+                                copyfd(psh, rp->renamed[i], i);
+                                shfile_close(&psh->fdtab, rp->renamed[i]);
                         }
                 }
@@ -330 +330 @@
 RESET {
         while (redirlist)
-                popredir();
+                popredir(psh);
 }
 
 SHELLPROC {
-        clearredir(0);
+        clearredir(psh, 0);
 }
 
@@ -341 +341 @@
 /* Return true if fd 0 has already been redirected at least once.  */
 int
-fd0_redirected_p () {
-        return fd0_redirected != 0;
+fd0_redirected_p(shinstance *psh) {
+        return psh->fd0_redirected != 0;
 }
 
@@ -376 +376 @@
 
 int
-copyfd(int from, int to)
+copyfd(shinstance *psh, int from, int to)
 {
         int newfd;
 
-        newfd = fcntl(from, F_DUPFD, to);
+        newfd = shfile_fcntl(psh, from, F_DUPFD, to);
         if (newfd < 0) {
                 if (errno == EMFILE)