jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 01:38:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

1. Add check to see if CPIO floppy extracted properly.

Browse Source 
2. See if swapon() failed and at least print a diagnostic.
3. Use -1 instead of strheight()/strwidth() everywhere.

Reviewed by:
Submitted by:
Obtained from:
This commit is contained in:
Jordan K. Hubbard 1994-11-17 14:12:38 +00:00
parent ccac3799a7
commit c1b05c7986
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=4554
4 changed files with 161 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbin/sysinstall/ourcurses.c
View File

@ -54,6 +54,8 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
case '\r':
done = 1;
break;
case '\001': /* ^A */
case KEY_HOME:
if (len < width) {
fpos = len;
@ -65,6 +67,8 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
dispos = len - width;
};
break;
case '\005': /* ^E */
case KEY_END:
if (len < width) {
dispos = 0;
@ -75,6 +79,8 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
}
fpos = len - 1;
break;
case '\002': /* ^B */
case KEY_LEFT:
if ((!curpos) && (!dispos)) {
beep();
@ -88,6 +94,8 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
if (--fpos < 0)
fpos = 0;
break;
case '\006': /* ^F */
case KEY_RIGHT:
if ((curpos + dispos) == len) {
beep();
@ -107,6 +115,7 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
fpos = len;
}
break;
case KEY_BACKSPACE:
case KEY_DC:
if ((!curpos) && (!dispos)) {
@ -126,6 +135,7 @@ edit_line(WINDOW *window, int y, int x, char *field, int width, int maxlen)
} else
beep();
break;
default:
if (len < maxlen - 1) {
memmove(field+fpos+1, field+fpos, len - fpos);
@ -174,10 +184,11 @@ ShowFile(char *filename, char *header)
char buf[256];
if (access(filename, R_OK)) {
sprintf(buf, "The %s file is not provided on the 1.2MB floppy image.", filename);
dialog_msgbox("Sorry!", buf, strheight(buf)+4, strwidth(buf)+4, 1);
dialog_msgbox("Sorry!", buf, -1, -1, 1);
return;
}
dialog_clear();
dialog_textbox(header, filename, LINES, COLS);
dialog_clear();
}

6
sbin/sysinstall/stage3.c
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: stage3.c,v 1.7 1994/11/02 06:19:47 jkh Exp $
* $Id: stage3.c,v 1.8 1994/11/08 13:40:01 phk Exp $
*
*/
@ -46,7 +46,9 @@ stage3()
if (*p++ != '/') continue;
if (!strcmp(fs->fs_type, "sw")) {
swapon(fs->fs_spec);
if (swapon(fs->fs_spec) == -1)
AskAbort("Unable to swap to %s - are you sure it's right?",
fs->fs_spec);
continue;
}

7
sbin/sysinstall/stage4.c
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: stage4.c,v 1.4 1994/11/02 06:19:49 jkh Exp $
* $Id: stage4.c,v 1.5 1994/11/02 07:15:55 jkh Exp $
*
*/
@ -76,6 +76,11 @@ stage4()
Fatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
if (access("/stand/cpio_floppy_done", R_OK) == -1)
Fatal("CPIO floppy was bad! Please check media for defects.");
else {
TellEm("unlink /stand/need_cpio_floppy");
unlink("/stand/need_cpio_floppy");
unlink("/stand/cpio_floppy_done");
}
}

6
sbin/sysinstall/utils.c
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: utils.c,v 1.26 1994/11/07 13:48:54 jkh Exp $
* $Id: utils.c,v 1.27 1994/11/16 14:42:22 ache Exp $
*
*/
@ -68,7 +68,7 @@ TellEm(char *fmt, ...)
write(debug_fd,">\n\r",3);
dialog_clear();
dialog_update();
dialog_msgbox("Progress", p, strheight(p)+2, strwidth(p)+4, 0);
dialog_msgbox("Progress", p, -1, -1, 0);
free(p);
}
@ -83,7 +83,7 @@ Fatal(char *fmt, ...)
va_end(ap);
strip_trailing_newlines(p);
if (dialog_active)
dialog_msgbox("Fatal", p, strheight(p)+4, strwidth(p)+4, 1);
dialog_msgbox("Fatal", p, -1, -1, 1);
else
fprintf(stderr, "Fatal -- %s\n", p);
free(p);