mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00
Code Issues Releases Activity

Don't clear the screen for every redraw in the disklabel and

Browse Source 
partition editors (ugh).  Fix an utterly bogus message (no arguments :)
in dist.c.  This should all make Poul a little happier and slide in
before the next CTM update window.
This commit is contained in:
Jordan K. Hubbard 1995-05-20 19:22:21 +00:00
parent 9f857b511d
commit cc1f1b8814
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8659
11 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/disks.c
View File

@ -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.22 1995/05/18 09:01:50 jkh Exp $
* $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -79,7 +79,6 @@ print_chunks(Disk *d)
int row;
int i;
clear();
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
@ -129,6 +128,7 @@ diskPartition(Disk *d)
strncpy(name, d->name, 40);
keypad(stdscr, TRUE);
clear();
record_chunks(d);
while (chunking) {
print_chunks(d);

5
release/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
* $Id: dist.c,v 1.12 1995/05/20 11:13:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -229,7 +229,8 @@ distExtract(char *parent, Distribution *me)
if (getenv(NO_CONFIRMATION))
status = 0;
else
status = msgYesNo("Unable to transfer the %s distribution from %s.\nDo you want to retry this distribution later?");
status = msgYesNo("Unable to transfer the %s%s distribution from %s.\nDo you want to retry this distribution later?", parent ? parent :
"", me[i].my_name, mediaDevice->name);
}
}
if (!status) {

17
release/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.40 1995/05/20 18:37:03 jkh Exp $
* $Id: install.c,v 1.41 1995/05/20 19:12:11 phk Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -320,21 +320,24 @@ cpio_extract(void)
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("gunzip returned error status of %d!", _WSTATUS(j));
exit(1);
}
i = waitpid(cpid, &j, 0);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("cpio returned error status of %d!", _WSTATUS(j));
exit(2);
}
exit(0);
}
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again");
if (i < 0 || _WSTATUS(j) || access("/mnt/OK", R_OK) == -1) {
dialog_clear();
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again.");
close(CpioFD);
CpioFD = -1;
goto tryagain;

4
release/sysinstall/label.c
View File

@ -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.10 1995/05/19 02:19:15 jkh Exp $
* $Id: label.c,v 1.11 1995/05/20 10:33:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -280,7 +280,6 @@ print_label_chunks(void)
int i, j, srow, prow, pcol;
int sz;
clear();
attrset(A_REVERSE);
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
attrset(A_NORMAL);
@ -407,6 +406,7 @@ diskLabelEditor(char *str)
msgConfirm("You need to partition your disk(s) before you can assign disk labels.");
return 0;
}
clear();
while (labeling) {
print_label_chunks();
print_command_summary();

4
usr.sbin/sade/disks.c
View File

@ -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.22 1995/05/18 09:01:50 jkh Exp $
* $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -79,7 +79,6 @@ print_chunks(Disk *d)
int row;
int i;
clear();
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
@ -129,6 +128,7 @@ diskPartition(Disk *d)
strncpy(name, d->name, 40);
keypad(stdscr, TRUE);
clear();
record_chunks(d);
while (chunking) {
print_chunks(d);

17
usr.sbin/sade/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.40 1995/05/20 18:37:03 jkh Exp $
* $Id: install.c,v 1.41 1995/05/20 19:12:11 phk Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -320,21 +320,24 @@ cpio_extract(void)
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("gunzip returned error status of %d!", _WSTATUS(j));
exit(1);
}
i = waitpid(cpid, &j, 0);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("cpio returned error status of %d!", _WSTATUS(j));
exit(2);
}
exit(0);
}
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again");
if (i < 0 || _WSTATUS(j) || access("/mnt/OK", R_OK) == -1) {
dialog_clear();
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again.");
close(CpioFD);
CpioFD = -1;
goto tryagain;

4
usr.sbin/sade/label.c
View File

@ -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.10 1995/05/19 02:19:15 jkh Exp $
* $Id: label.c,v 1.11 1995/05/20 10:33:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -280,7 +280,6 @@ print_label_chunks(void)
int i, j, srow, prow, pcol;
int sz;
clear();
attrset(A_REVERSE);
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
attrset(A_NORMAL);
@ -407,6 +406,7 @@ diskLabelEditor(char *str)
msgConfirm("You need to partition your disk(s) before you can assign disk labels.");
return 0;
}
clear();
while (labeling) {
print_label_chunks();
print_command_summary();

4
usr.sbin/sysinstall/disks.c
View File

@ -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.22 1995/05/18 09:01:50 jkh Exp $
* $Id: disks.c,v 1.23 1995/05/20 10:33:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -79,7 +79,6 @@ print_chunks(Disk *d)
int row;
int i;
clear();
attrset(A_NORMAL);
mvaddstr(0, 0, "Disk name:\t");
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
@ -129,6 +128,7 @@ diskPartition(Disk *d)
strncpy(name, d->name, 40);
keypad(stdscr, TRUE);
clear();
record_chunks(d);
while (chunking) {
print_chunks(d);

5
usr.sbin/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
* $Id: dist.c,v 1.12 1995/05/20 11:13:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -229,7 +229,8 @@ distExtract(char *parent, Distribution *me)
if (getenv(NO_CONFIRMATION))
status = 0;
else
status = msgYesNo("Unable to transfer the %s distribution from %s.\nDo you want to retry this distribution later?");
status = msgYesNo("Unable to transfer the %s%s distribution from %s.\nDo you want to retry this distribution later?", parent ? parent :
"", me[i].my_name, mediaDevice->name);
}
}
if (!status) {

17
usr.sbin/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.40 1995/05/20 18:37:03 jkh Exp $
* $Id: install.c,v 1.41 1995/05/20 19:12:11 phk Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -320,21 +320,24 @@ cpio_extract(void)
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("gunzip returned error status of %d!", _WSTATUS(j));
exit(1);
}
i = waitpid(cpid, &j, 0);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)!", j, strerror(errno), errno);
if (i < 0 || _WSTATUS(j)) {
dialog_clear();
msgConfirm("cpio returned error status of %d!", _WSTATUS(j));
exit(2);
}
exit(0);
}
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again");
if (i < 0 || _WSTATUS(j) || access("/mnt/OK", R_OK) == -1) {
dialog_clear();
msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again.");
close(CpioFD);
CpioFD = -1;
goto tryagain;

4
usr.sbin/sysinstall/label.c
View File

@ -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.10 1995/05/19 02:19:15 jkh Exp $
* $Id: label.c,v 1.11 1995/05/20 10:33:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -280,7 +280,6 @@ print_label_chunks(void)
int i, j, srow, prow, pcol;
int sz;
clear();
attrset(A_REVERSE);
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
attrset(A_NORMAL);
@ -407,6 +406,7 @@ diskLabelEditor(char *str)
msgConfirm("You need to partition your disk(s) before you can assign disk labels.");
return 0;
}
clear();
while (labeling) {
print_label_chunks();
print_command_summary();