summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-09-20 02:48:48 +0000
committerjkh <jkh@FreeBSD.org>1997-09-20 02:48:48 +0000
commitd940e50d4cd0913ec8126c0b728a7f67842ffefd (patch)
treefce6bf134768755c29e602a1857a968bdb833c86 /usr.sbin
parente28110371d10d8786ddcae7b35258ab24617fa8d (diff)
downloadFreeBSD-src-d940e50d4cd0913ec8126c0b728a7f67842ffefd.zip
FreeBSD-src-d940e50d4cd0913ec8126c0b728a7f67842ffefd.tar.gz
Fix conditional bogon in Label Editor [from Ed Gold]
Print info boxes without titles.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/label.c8
-rw-r--r--usr.sbin/sade/msg.c6
-rw-r--r--usr.sbin/sysinstall/label.c8
-rw-r--r--usr.sbin/sysinstall/msg.c6
4 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 161560d..0750fe1 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
+ * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
label_chunk_info[j].c = NULL;
if (here >= j) {
here = j ? j - 1 : 0;
- pslice_focus = here; /* VEG 09/05/97 */
- label_focus = here; /* VEG 09/05/97 */
}
if (ChunkWin) {
wclear(ChunkWin);
@@ -607,6 +605,8 @@ diskLabel(char *str)
Device **devs;
int override_focus_adjust = 0;
+ label_focus = 0;
+ pslice_focus = 0;
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
if (!devs) {
msgConfirm("No disks found!");
@@ -1067,7 +1067,7 @@ diskLabel(char *str)
msg = _msg;
break;
}
- if (override_focus_adjust) {
+ if (!override_focus_adjust) {
if (label_chunk_info[here].type == PART_SLICE)
pslice_focus = here;
else
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 6da5398..e61b767 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
+ * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
if (isDebug())
msgDebug("Notify: %s\n", errstr);
dialog_clear_norefresh();
- dialog_msgbox(" ", errstr, -1, -1, 0);
+ dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
use_helpfile(NULL);
msgDebug("Notify: %s\n", errstr);
dialog_clear_norefresh();
- dialog_msgbox(" ", errstr, -1, -1, 0);
+ dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 161560d..0750fe1 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
+ * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
label_chunk_info[j].c = NULL;
if (here >= j) {
here = j ? j - 1 : 0;
- pslice_focus = here; /* VEG 09/05/97 */
- label_focus = here; /* VEG 09/05/97 */
}
if (ChunkWin) {
wclear(ChunkWin);
@@ -607,6 +605,8 @@ diskLabel(char *str)
Device **devs;
int override_focus_adjust = 0;
+ label_focus = 0;
+ pslice_focus = 0;
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
if (!devs) {
msgConfirm("No disks found!");
@@ -1067,7 +1067,7 @@ diskLabel(char *str)
msg = _msg;
break;
}
- if (override_focus_adjust) {
+ if (!override_focus_adjust) {
if (label_chunk_info[here].type == PART_SLICE)
pslice_focus = here;
else
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 6da5398..e61b767 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
+ * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
if (isDebug())
msgDebug("Notify: %s\n", errstr);
dialog_clear_norefresh();
- dialog_msgbox(" ", errstr, -1, -1, 0);
+ dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
use_helpfile(NULL);
msgDebug("Notify: %s\n", errstr);
dialog_clear_norefresh();
- dialog_msgbox(" ", errstr, -1, -1, 0);
+ dialog_msgbox(NULL, errstr, -1, -1, 0);
}
/* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
OpenPOWER on IntegriCloud