summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/disks.c5
-rw-r--r--release/sysinstall/label.c2
-rw-r--r--release/sysinstall/system.c3
-rw-r--r--usr.sbin/sade/disks.c5
-rw-r--r--usr.sbin/sade/label.c2
-rw-r--r--usr.sbin/sade/system.c3
-rw-r--r--usr.sbin/sysinstall/disks.c5
-rw-r--r--usr.sbin/sysinstall/label.c2
-rw-r--r--usr.sbin/sysinstall/system.c3
9 files changed, 15 insertions, 15 deletions
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index fd28106..399c812 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
+ * $Id: disks.c,v 1.24 1995/05/20 19:22:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -81,6 +81,7 @@ print_chunks(Disk *d)
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
+ clrtobot();
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
attrset(A_REVERSE); mvaddstr(0, 55, "Master Partition Editor"); attrset(A_NORMAL);
mvprintw(1, 0,
@@ -92,7 +93,7 @@ print_chunks(Disk *d)
for (i = 0, row = CHUNK_START_ROW; chunk_info[i]; i++, row++) {
if (i == current_chunk)
attrset(A_REVERSE);
- mvprintw(row, 2, "%10lu %10lu %10lu %8s %8d %8s %8d %6lx",
+ mvprintw(row, 2, "%10ld %10lu %10lu %8s %8d %8s %8d %6lx",
chunk_info[i]->offset, chunk_info[i]->size,
chunk_info[i]->end, chunk_info[i]->name,
chunk_info[i]->type, chunk_n[chunk_info[i]->type],
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 68db110..fbc9c5e 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -586,7 +586,7 @@ diskLabelEditor(char *str)
msgConfirm("Can't find any disk devicse!");
break;
}
- for (i = 0; ((Disk *)devs[i]->private); i++) {
+ for (i = 0; devs[i] && ((Disk *)devs[i]->private); i++) {
if (devs[i]->enabled)
slice_wizard(((Disk *)devs[i]->private));
}
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index 3a75e9d..8c07585 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.25 1995/05/20 23:33:14 phk Exp $
+ * $Id: system.c,v 1.26 1995/05/21 01:56:03 phk Exp $
*
* Jordan Hubbard
*
@@ -74,7 +74,6 @@ systemInitialize(int argc, char **argv)
setlogin("root");
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
setbuf(stdin, 0);
- setbuf(stdout, 0);
setbuf(stderr, 0);
}
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index fd28106..399c812 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
+ * $Id: disks.c,v 1.24 1995/05/20 19:22:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -81,6 +81,7 @@ print_chunks(Disk *d)
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
+ clrtobot();
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
attrset(A_REVERSE); mvaddstr(0, 55, "Master Partition Editor"); attrset(A_NORMAL);
mvprintw(1, 0,
@@ -92,7 +93,7 @@ print_chunks(Disk *d)
for (i = 0, row = CHUNK_START_ROW; chunk_info[i]; i++, row++) {
if (i == current_chunk)
attrset(A_REVERSE);
- mvprintw(row, 2, "%10lu %10lu %10lu %8s %8d %8s %8d %6lx",
+ mvprintw(row, 2, "%10ld %10lu %10lu %8s %8d %8s %8d %6lx",
chunk_info[i]->offset, chunk_info[i]->size,
chunk_info[i]->end, chunk_info[i]->name,
chunk_info[i]->type, chunk_n[chunk_info[i]->type],
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 68db110..fbc9c5e 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -586,7 +586,7 @@ diskLabelEditor(char *str)
msgConfirm("Can't find any disk devicse!");
break;
}
- for (i = 0; ((Disk *)devs[i]->private); i++) {
+ for (i = 0; devs[i] && ((Disk *)devs[i]->private); i++) {
if (devs[i]->enabled)
slice_wizard(((Disk *)devs[i]->private));
}
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index 3a75e9d..8c07585 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.25 1995/05/20 23:33:14 phk Exp $
+ * $Id: system.c,v 1.26 1995/05/21 01:56:03 phk Exp $
*
* Jordan Hubbard
*
@@ -74,7 +74,6 @@ systemInitialize(int argc, char **argv)
setlogin("root");
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
setbuf(stdin, 0);
- setbuf(stdout, 0);
setbuf(stderr, 0);
}
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index fd28106..399c812 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
+ * $Id: disks.c,v 1.24 1995/05/20 19:22:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -81,6 +81,7 @@ print_chunks(Disk *d)
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
+ clrtobot();
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
attrset(A_REVERSE); mvaddstr(0, 55, "Master Partition Editor"); attrset(A_NORMAL);
mvprintw(1, 0,
@@ -92,7 +93,7 @@ print_chunks(Disk *d)
for (i = 0, row = CHUNK_START_ROW; chunk_info[i]; i++, row++) {
if (i == current_chunk)
attrset(A_REVERSE);
- mvprintw(row, 2, "%10lu %10lu %10lu %8s %8d %8s %8d %6lx",
+ mvprintw(row, 2, "%10ld %10lu %10lu %8s %8d %8s %8d %6lx",
chunk_info[i]->offset, chunk_info[i]->size,
chunk_info[i]->end, chunk_info[i]->name,
chunk_info[i]->type, chunk_n[chunk_info[i]->type],
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 68db110..fbc9c5e 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -586,7 +586,7 @@ diskLabelEditor(char *str)
msgConfirm("Can't find any disk devicse!");
break;
}
- for (i = 0; ((Disk *)devs[i]->private); i++) {
+ for (i = 0; devs[i] && ((Disk *)devs[i]->private); i++) {
if (devs[i]->enabled)
slice_wizard(((Disk *)devs[i]->private));
}
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 3a75e9d..8c07585 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.25 1995/05/20 23:33:14 phk Exp $
+ * $Id: system.c,v 1.26 1995/05/21 01:56:03 phk Exp $
*
* Jordan Hubbard
*
@@ -74,7 +74,6 @@ systemInitialize(int argc, char **argv)
setlogin("root");
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
setbuf(stdin, 0);
- setbuf(stdout, 0);
setbuf(stderr, 0);
}
OpenPOWER on IntegriCloud