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

Timestamp:

Sep 2, 2020, 10:30:54 PM (5 years ago)

Author:

bird

Message:

kash: Remove vfork code, we've never used it and we wont need it if we replace fork() with pthreads.

File:

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

trunk/src/kash/redir.c

@@ -114 +114 @@
         memory[1] = flags & REDIR_BACKQ;
         if (flags & REDIR_PUSH) {
-                /* We don't have to worry about REDIR_VFORK here, as
-                 * flags & REDIR_PUSH is never true if REDIR_VFORK is set.
-                 */
                 sv = ckmalloc(psh, sizeof (struct redirtab));
                 for (i = 0 ; i < 10 ; i++)
@@ -174 +171 @@
         char *fname;
         int f;
-        int oflags = O_WRONLY|O_CREAT|O_TRUNC, eflags;
+        int oflags = O_WRONLY|O_CREAT|O_TRUNC;
 
         /*
@@ -186 +183 @@
         case NFROM:
                 fname = redir->nfile.expfname;
-                if (flags & REDIR_VFORK)
-                        eflags = O_NONBLOCK;
-                else
-                        eflags = 0;
-                if ((f = shfile_open(&psh->fdtab, fname, O_RDONLY|eflags, 0)) < 0)
+                if ((f = shfile_open(&psh->fdtab, fname, O_RDONLY, 0)) < 0)
                         goto eopen;
-                if (eflags)
-                        (void)shfile_fcntl(&psh->fdtab, f, F_SETFL, shfile_fcntl(&psh->fdtab, f, F_GETFL, 0) & ~eflags);
                 break;
         case NFROMTO:
@@ -365 +356 @@
 
 SHELLPROC {
-        clearredir(psh, 0);
+        clearredir(psh);
 }
 
@@ -381 +372 @@
 
 void
-clearredir(shinstance *psh, int vforked)
+clearredir(shinstance *psh)
 {
         struct redirtab *rp;
@@ -391 +382 @@
                                 shfile_close(&psh->fdtab, rp->renamed[i]);
                         }
-                        if (!vforked)
-                                rp->renamed[i] = EMPTY;
+                        rp->renamed[i] = EMPTY;
                 }
         }