From 1fadece3ee34f78af238b3485ee29266d782e04c Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Tue, 30 Apr 1996 21:22:29 +0000
Subject: [PATCH] Fix another couple of bogons with the package menu.

---
 release/sysinstall/index.c  | 13 +++++++------
 usr.sbin/sysinstall/index.c | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c
index fd24dd064069..d3095f14537d 100644
--- a/release/sysinstall/index.c
+++ b/release/sysinstall/index.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: index.c,v 1.25 1996/04/28 03:27:00 jkh Exp $
+ * $Id: index.c,v 1.26 1996/04/30 06:00:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -389,11 +389,12 @@ pkg_checked(dialogMenuItem *self)
 int
 pkg_fire(dialogMenuItem *self)
 {
+    int ret;
     PkgNodePtr sp, kp = self->data, plist = (PkgNodePtr)self->aux;
 
     if (!plist)
-	return DITEM_FAILURE;
-    if (kp->type == PACKAGE) {
+	ret = DITEM_FAILURE;
+    else if (kp->type == PACKAGE) {
 	sp = index_search(plist, kp->name, NULL);
 	/* Not already selected? */
 	if (!sp) {
@@ -408,14 +409,16 @@ pkg_fire(dialogMenuItem *self)
 	    msgInfo("Removed %s from selection list", kp->name);
 	    index_delete(sp);
 	}
+	ret = DITEM_SUCCESS;
     }
     else {	/* Not a package, must be a directory */
 	int p, s;
 		    
 	p = s = 0;
 	index_menu(kp, plist, &p, &s);
+	ret = DITEM_SUCCESS | DITEM_CONTINUE;
     }
-    return DITEM_SUCCESS;
+    return ret;
 }
 
 void
@@ -499,8 +502,6 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
 	    }
 	    continue;
 	}
-	else if (!rval && hasPackages)
-	    continue;
     }
     items_free(nitems, &curr, &max);
     restorescr(w);
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index fd24dd064069..d3095f14537d 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: index.c,v 1.25 1996/04/28 03:27:00 jkh Exp $
+ * $Id: index.c,v 1.26 1996/04/30 06:00:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -389,11 +389,12 @@ pkg_checked(dialogMenuItem *self)
 int
 pkg_fire(dialogMenuItem *self)
 {
+    int ret;
     PkgNodePtr sp, kp = self->data, plist = (PkgNodePtr)self->aux;
 
     if (!plist)
-	return DITEM_FAILURE;
-    if (kp->type == PACKAGE) {
+	ret = DITEM_FAILURE;
+    else if (kp->type == PACKAGE) {
 	sp = index_search(plist, kp->name, NULL);
 	/* Not already selected? */
 	if (!sp) {
@@ -408,14 +409,16 @@ pkg_fire(dialogMenuItem *self)
 	    msgInfo("Removed %s from selection list", kp->name);
 	    index_delete(sp);
 	}
+	ret = DITEM_SUCCESS;
     }
     else {	/* Not a package, must be a directory */
 	int p, s;
 		    
 	p = s = 0;
 	index_menu(kp, plist, &p, &s);
+	ret = DITEM_SUCCESS | DITEM_CONTINUE;
     }
-    return DITEM_SUCCESS;
+    return ret;
 }
 
 void
@@ -499,8 +502,6 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
 	    }
 	    continue;
 	}
-	else if (!rval && hasPackages)
-	    continue;
     }
     items_free(nitems, &curr, &max);
     restorescr(w);