summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-04-30 06:13:50 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-04-30 06:13:50 +0000
commitf848fa52b63aadedcae05e237ec9da74e7d44a6a (patch)
treefb3f40493b5d69bb69417b3215d0d1506fe6affe
parent351ad0d904f72f4547a10037f37ba87a988301ee (diff)
Notes
-rw-r--r--release/sysinstall/package.c5
-rw-r--r--usr.sbin/sysinstall/package.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index 515372dca6a6..ce7f1a6e1244 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: package.c,v 1.33 1996/04/28 03:27:22 jkh Exp $
+ * $Id: package.c,v 1.34 1996/04/30 05:40:15 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -107,6 +107,7 @@ package_extract(Device *dev, char *name, Boolean depended)
char buf[BUFSIZ];
WINDOW *w = savescr();
+ close(pfd[0]);
tot = 0;
while ((i = read(fd, buf, BUFSIZ)) > 0) {
char line[80];
@@ -123,8 +124,8 @@ package_extract(Device *dev, char *name, Boolean depended)
clrtoeol();
refresh();
}
- close(fd);
close(pfd[1]);
+ dev->close(dev, fd);
mvprintw(0, 0, "Package %s read successfully - waiting for pkg_add", name);
refresh();
i = waitpid(pid, &tot, 0);
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 515372dca6a6..ce7f1a6e1244 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: package.c,v 1.33 1996/04/28 03:27:22 jkh Exp $
+ * $Id: package.c,v 1.34 1996/04/30 05:40:15 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -107,6 +107,7 @@ package_extract(Device *dev, char *name, Boolean depended)
char buf[BUFSIZ];
WINDOW *w = savescr();
+ close(pfd[0]);
tot = 0;
while ((i = read(fd, buf, BUFSIZ)) > 0) {
char line[80];
@@ -123,8 +124,8 @@ package_extract(Device *dev, char *name, Boolean depended)
clrtoeol();
refresh();
}
- close(fd);
close(pfd[1]);
+ dev->close(dev, fd);
mvprintw(0, 0, "Package %s read successfully - waiting for pkg_add", name);
refresh();
i = waitpid(pid, &tot, 0);