Changeset 1212 in kBuild for trunk/src

Timestamp:

Oct 7, 2007 6:42:48 PM (17 years ago)

Author:

bird

Message:

redir.c

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (2 diffs)
• generated/init.c (modified) (1 diff)
• redir.c (modified) (15 diffs)

trunk/src/kash/Makefile.kmk

@@ -47 +47 @@
         output.c \
         parser.c \
+        redir.c \
         show.c \
         syntax.c \
@@ -55 +56 @@
         bltin/test.c \
         \
-        redir.c \
         bltin/kill.c \
         $(PATH_TARGET)/arith.c \

trunk/src/kash/generated/init.c

@@ -160 +160 @@
 };
 
-extern struct redirtab *redirlist;
+//extern struct redirtab *redirlist;
 
 extern char sigmode[NSIG];      /* current value of signal */

trunk/src/kash/redir.c

@@ -85 +85 @@
 
 
-MKINIT struct redirtab *redirlist;
+//MKINIT struct redirtab *redirlist;
 
 /*
@@ -92 +92 @@
  * if it hasn't already been redirected.
 */
-int fd0_redirected = 0;
-
-STATIC void openredirect(union node *, char[10], int);
-STATIC int openhere(union node *);
+//int fd0_redirected = 0;
+
+STATIC void openredirect(shinstance *, union node *, char[10], int);
+STATIC int openhere(shinstance *, union node *);
 
 
@@ -107 +107 @@
 
 void
-redirect(union node *redir, int flags)
+redirect(shinstance *psh, union node *redir, int flags)
 {
         union node *n;
@@ -126 +126 @@
                 for (i = 0 ; i < 10 ; i++)
                         sv->renamed[i] = EMPTY;
-                sv->next = redirlist;
-                redirlist = sv;
+                sv->next = psh->redirlist;
+                psh->redirlist = sv;
         }
         for (n = redir ; n ; n = n->nfile.next) {
@@ -143 +143 @@
                                 case EBADF:
                                         if (!try) {
-                                                openredirect(n, memory, flags);
+                                                openredirect(psh, n, memory, flags);
                                                 try++;
                                                 goto again;
@@ -163 +163 @@
                 }
                 if (fd == 0)
-                        fd0_redirected++;
+                        psh->fd0_redirected++;
                 if (!try)
-                        openredirect(n, memory, flags);
+                        openredirect(psh, n, memory, flags);
         }
         if (memory[1])
@@ -175 +175 @@
 
 STATIC void
-openredirect(union node *redir, char memory[10], int flags)
+openredirect(shinstance *psh, union node *redir, char memory[10], int flags)
 {
         int fd = redir->nfile.fd;
@@ -232 +232 @@
         case NHERE:
         case NXHERE:
-                f = openhere(redir);
+                f = openhere(psh, redir);
                 break;
         default:
@@ -258 +258 @@
 
 STATIC int
-openhere(union node *redir)
+openhere(shinstance *psh, union node *redir)
 {
         int pip[2];
-        int len = 0;
-
-        if (pipe(pip) < 0)
+        size_t len = 0;
+
+        if (shfile_pipe(&psh->fdtab, pip) < 0)
                 error(psh, "Pipe call failed");
         if (redir->type == NHERE) {
@@ -299 +299 @@
 
 void
-popredir(void)
-{
-        struct redirtab *rp = redirlist;
+popredir(shinstance *psh)
+{
+        struct redirtab *rp = psh->redirlist;
         int i;
 
@@ -307 +307 @@
                 if (rp->renamed[i] != EMPTY) {
                         if (i == 0)
-                                fd0_redirected--;
+                                psh->fd0_redirected--;
                         shfile_close(&psh->fdtab, i);
                         if (rp->renamed[i] >= 0) {
@@ -316 +316 @@
         }
         INTOFF;
-        redirlist = rp->next;
+        psh->redirlist = rp->next;
         ckfree(rp);
         INTON;
@@ -330 +330 @@
 
 RESET {
-        while (redirlist)
+        while (psh->redirlist)
                 popredir(psh);
 }
@@ -351 +351 @@
 
 void
-clearredir(vforked)
-        int vforked;
+clearredir(shinstance *psh, int vforked)
 {
         struct redirtab *rp;
         int i;
 
-        for (rp = redirlist ; rp ; rp = rp->next) {
+        for (rp = psh->redirlist ; rp ; rp = rp->next) {
                 for (i = 0 ; i < 10 ; i++) {
                         if (rp->renamed[i] >= 0) {
@@ -381 +380 @@
         int newfd;
 
-        newfd = shfile_fcntl(psh, from, F_DUPFD, to);
+        newfd = shfile_fcntl(&psh->fdtab, from, F_DUPFD, to);
         if (newfd < 0) {
                 if (errno == EMFILE)