Allow user to delete as well as install packages from the package

installer menu.

Fix status line code so informationals show up properly again.

3 files changed, 3 insertions, 3 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 84139dc..2e1a1cd 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 4ed2476..2fd55f8 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 4b93f1e..a72c0a4 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;
 }