From f39a7cf3f42a8acb7570b325bc6d5823caaef38f Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Wed, 20 Mar 1985 02:46:40 -0800
Subject: [PATCH] update dup() to dup2()

SCCS-vsn: old/sh/io.c 4.3
SCCS-vsn: old/sh/main.c 4.3
---
 usr/src/old/sh/io.c   | 5 ++---
 usr/src/old/sh/main.c | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr/src/old/sh/io.c b/usr/src/old/sh/io.c
index fd14d7bbd7..7586de6a93 100644
--- a/usr/src/old/sh/io.c
+++ b/usr/src/old/sh/io.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)io.c	4.2 %G%";
+static char sccsid[] = "@(#)io.c	4.3 %G%";
 #endif
 
 #
@@ -12,7 +12,6 @@ static char sccsid[] = "@(#)io.c	4.2 %G%";
  */
 
 #include	"defs.h"
-#include	"dup.h"
 
 
 /* ========	input output and file copying ======== */
@@ -83,7 +82,7 @@ rename(f1,f2)
 	REG INT		f1, f2;
 {
 	IF f1!=f2
-	THEN	dup(f1|DUPFLG, f2);
+	THEN	dup2(f1, f2);
 		close(f1);
 		IF f2==0 THEN ioset|=1 FI
 	FI
diff --git a/usr/src/old/sh/main.c b/usr/src/old/sh/main.c
index a70227a2c6..579eee1393 100644
--- a/usr/src/old/sh/main.c
+++ b/usr/src/old/sh/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)main.c	4.2 %G%";
+static char sccsid[] = "@(#)main.c	4.3 %G%";
 #endif
 
 #
@@ -12,12 +12,12 @@ static char sccsid[] = "@(#)main.c	4.2 %G%";
  */
 
 #include	"defs.h"
-#include	"dup.h"
 #include	"sym.h"
 #include	"timeout.h"
 #include	<sys/types.h>
 #include	<sys/stat.h>
 #include	<sgtty.h>
+#include	<signal.h>
 
 UFD		output = 2;
 LOCAL BOOL	beenhere = FALSE;
@@ -45,7 +45,7 @@ main(c, v)
 	addblok((POS)0);
 
 	/* set names from userenv */
-	getenv();
+	setupenv();
 
 	/* look for restricted */
 /*	IF c>0 ANDF any('r', *v) THEN rflag=0 FI */
@@ -183,7 +183,7 @@ settmp()
 Ldup(fa, fb)
 	REG INT		fa, fb;
 {
-	dup(fa|DUPFLG, fb);
+	dup2(fa, fb);
 	close(fa);
 	ioctl(fb, FIOCLEX, 0);
 }
-- 
2.20.1