From 284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sat, 16 Feb 2008 13:18:17 +0000
Subject: 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

---
 shell/hush.c | 2 +-
 shell/msh.c  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'shell')

diff --git a/shell/hush.c b/shell/hush.c
index 3f46103..8afa15e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3243,7 +3243,7 @@ static FILE *generate_stream_from_list(struct pipe *head)
 	if (pid == 0) { /* child */
 		if (ENABLE_HUSH_JOB)
 			die_sleep = 0; /* let nofork's xfuncs die */
-		close(channel[0]);
+		close(channel[0]); /* NB: close _first_, then move fd! */
 		xmove_fd(channel[1], 1);
 		/* Prevent it from trying to handle ctrl-z etc */
 #if ENABLE_HUSH_JOB
diff --git a/shell/msh.c b/shell/msh.c
index 6555604..fd287f1 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;
-- 
cgit v1.1