random s/short/int/

add_cmd                                             1189    1190      +1
xconnect_ftpdata                                     118     117      -1
data_align                                            86      84      -2
process_files                                       2101    2096      -5
forkexec                                            1345    1334     -11

1 files changed, 3 insertions, 5 deletions

diff --git a/shell/msh.c b/shell/msh.c
index 65556043d..fd287f16e 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -2797,15 +2797,13 @@ static int forkexec(struct op *t, int *pin, int *pout, int no_fork, char **wp)
                         if (!bltin)
                                 export(lookup(cp));
 
-        if (pin) {
+        if (pin) { /* NB: close _first_, then move fds! */
+                close(pin[1]);
                 xmove_fd(pin[0], 0);
-                if (pin[1] != 0)
-                        close(pin[1]);
         }
         if (pout) {
+                close(pout[0]);
                 xmove_fd(pout[1], 1);
-                if (pout[0] > 1)
-                        close(pout[0]);
         }
 
         iopp = t->ioact;