11 files changed, 25 insertions, 43 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 84139dc7a4a3..2e1a1cdb3962 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -541,9 +541,10 @@ configPackages(dialogMenuItem *self)
 		       "(or path to media) and try again.  If your local site does not\n"
 		       "carry the packages collection, then we recommend either a CD\n"
 		       "distribution or the master distribution on ftp.freebsd.org.");
+	    mediaDevice->shutdown(mediaDevice);
 	    return DITEM_FAILURE | DITEM_RESTORE;
 	}
-	msgNotify("Got INDEX successfully, now building packages menu..");
+	msgNotify("Located INDEX, now reading package data from it...");
 	index_init(&top, &plist);
 	if (index_read(fp, &top)) {
 	    msgConfirm("I/O or format error on packages/INDEX file.\n"
diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c
index 736e2575e585..0e2c20ff00ef 100644
--- a/release/sysinstall/index.c
+++ b/release/sysinstall/index.c
@@ -239,23 +239,6 @@ index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, cha
 }
 
 int
-index_get(char *fname, PkgNodePtr papa)
-{
-    int i;
-    FILE *fp;
-
-    fp = fopen(fname, "r");
-    if (!fp) {
-	fprintf(stderr, "Unable to open index file `%s' for reading.\n", fname);
-	i = -1;
-    }
-    else
-	i = index_read(fp, papa);
-    fclose(fp);
-    return i;
-}
-
-int
 index_read(FILE *fp, PkgNodePtr papa)
 {
     char name[127], pathto[255], prefix[255], comment[255], descr[127], maint[127], cats[511], deps[511];
@@ -429,6 +412,14 @@ pkg_fire(dialogMenuItem *self)
 		plist->kids = np;
 		msgInfo("Added %s to selection list", kp->name);
 	    }
+	    else {
+		WINDOW *save = savescr();
+
+		if (!msgYesNo("Do you really want to delete %s from the system?", kp->name))
+		    if (vsystem("pkg_delete %s %s", isDebug() ? "-v" : "", kp->name))
+			msgConfirm("Warning:  pkg_delete of %s failed.\n  Check debug output for details.", kp->name);
+		restorescr(save);
+	    }
 	}
 	else {
 	    msgInfo("Removed %s from selection list", kp->name);
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 4ed2476aee42..2fd55f8028cb 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -508,7 +508,6 @@ extern void	mediaShutdownFTP(Device *dev);
 extern void	globalsInit(void);
 
 /* index.c */
-int		index_get(char *fname, PkgNodePtr papa);
 int		index_read(FILE *fp, PkgNodePtr papa);
 int		index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll);
 void		index_init(PkgNodePtr top, PkgNodePtr plist);
diff --git a/release/sysinstall/termcap.c b/release/sysinstall/termcap.c
index 4b93f1e1fc3d..a72c0a4a3fb3 100644
--- a/release/sysinstall/termcap.c
+++ b/release/sysinstall/termcap.c
@@ -77,6 +77,6 @@ set_termcap(void)
 	msgDebug("Unable to get terminal size - errno %d\n", errno);
 	ts.ts_lines = 0;
     }
-    StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
+    StatusLine = ts.ts_lines ? ts.ts_lines - 1: (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
     return 0;
 }
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 84139dc7a4a3..2e1a1cdb3962 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -541,9 +541,10 @@ configPackages(dialogMenuItem *self)
 		       "(or path to media) and try again.  If your local site does not\n"
 		       "carry the packages collection, then we recommend either a CD\n"
 		       "distribution or the master distribution on ftp.freebsd.org.");
+	    mediaDevice->shutdown(mediaDevice);
 	    return DITEM_FAILURE | DITEM_RESTORE;
 	}
-	msgNotify("Got INDEX successfully, now building packages menu..");
+	msgNotify("Located INDEX, now reading package data from it...");
 	index_init(&top, &plist);
 	if (index_read(fp, &top)) {
 	    msgConfirm("I/O or format error on packages/INDEX file.\n"
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 4ed2476aee42..2fd55f8028cb 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -508,7 +508,6 @@ extern void	mediaShutdownFTP(Device *dev);
 extern void	globalsInit(void);
 
 /* index.c */
-int		index_get(char *fname, PkgNodePtr papa);
 int		index_read(FILE *fp, PkgNodePtr papa);
 int		index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll);
 void		index_init(PkgNodePtr top, PkgNodePtr plist);
diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c
index 4b93f1e1fc3d..a72c0a4a3fb3 100644
--- a/usr.sbin/sade/termcap.c
+++ b/usr.sbin/sade/termcap.c
@@ -77,6 +77,6 @@ set_termcap(void)
 	msgDebug("Unable to get terminal size - errno %d\n", errno);
 	ts.ts_lines = 0;
     }
-    StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
+    StatusLine = ts.ts_lines ? ts.ts_lines - 1: (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
     return 0;
 }
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 84139dc7a4a3..2e1a1cdb3962 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -541,9 +541,10 @@ configPackages(dialogMenuItem *self)
 		       "(or path to media) and try again.  If your local site does not\n"
 		       "carry the packages collection, then we recommend either a CD\n"
 		       "distribution or the master distribution on ftp.freebsd.org.");
+	    mediaDevice->shutdown(mediaDevice);
 	    return DITEM_FAILURE | DITEM_RESTORE;
 	}
-	msgNotify("Got INDEX successfully, now building packages menu..");
+	msgNotify("Located INDEX, now reading package data from it...");
 	index_init(&top, &plist);
 	if (index_read(fp, &top)) {
 	    msgConfirm("I/O or format error on packages/INDEX file.\n"
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index 736e2575e585..0e2c20ff00ef 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -239,23 +239,6 @@ index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, cha
 }
 
 int
-index_get(char *fname, PkgNodePtr papa)
-{
-    int i;
-    FILE *fp;
-
-    fp = fopen(fname, "r");
-    if (!fp) {
-	fprintf(stderr, "Unable to open index file `%s' for reading.\n", fname);
-	i = -1;
-    }
-    else
-	i = index_read(fp, papa);
-    fclose(fp);
-    return i;
-}
-
-int
 index_read(FILE *fp, PkgNodePtr papa)
 {
     char name[127], pathto[255], prefix[255], comment[255], descr[127], maint[127], cats[511], deps[511];
@@ -429,6 +412,14 @@ pkg_fire(dialogMenuItem *self)
 		plist->kids = np;
 		msgInfo("Added %s to selection list", kp->name);
 	    }
+	    else {
+		WINDOW *save = savescr();
+
+		if (!msgYesNo("Do you really want to delete %s from the system?", kp->name))
+		    if (vsystem("pkg_delete %s %s", isDebug() ? "-v" : "", kp->name))
+			msgConfirm("Warning:  pkg_delete of %s failed.\n  Check debug output for details.", kp->name);
+		restorescr(save);
+	    }
 	}
 	else {
 	    msgInfo("Removed %s from selection list", kp->name);
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 4ed2476aee42..2fd55f8028cb 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -508,7 +508,6 @@ extern void	mediaShutdownFTP(Device *dev);
 extern void	globalsInit(void);
 
 /* index.c */
-int		index_get(char *fname, PkgNodePtr papa);
 int		index_read(FILE *fp, PkgNodePtr papa);
 int		index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll);
 void		index_init(PkgNodePtr top, PkgNodePtr plist);
diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c
index 4b93f1e1fc3d..a72c0a4a3fb3 100644
--- a/usr.sbin/sysinstall/termcap.c
+++ b/usr.sbin/sysinstall/termcap.c
@@ -77,6 +77,6 @@ set_termcap(void)
 	msgDebug("Unable to get terminal size - errno %d\n", errno);
 	ts.ts_lines = 0;
     }
-    StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
+    StatusLine = ts.ts_lines ? ts.ts_lines - 1: (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE);
     return 0;
 }