hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-27 21:44:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the menu height calculation actually work.

Browse Source 
Make a menu more self-explanatory at user request.
This commit is contained in:
Jordan K. Hubbard 1996-07-11 18:37:48 +00:00
parent 15232ab26e
commit bd5706a78a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=17099
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/sysinstall/Makefile
View File

@ -1,7 +1,6 @@
PROG= sysinstall
NOMAN= yes
CLEANFILES= makedevs.c rtermcap
DEBUG_FLAGS+= -g3
CLEANFILES+= makedevs.c rtermcap
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
@ -14,8 +13,8 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp

4
release/sysinstall/dmenu.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: dmenu.c,v 1.21 1996/07/02 01:03:39 jkh Exp $
* $Id: dmenu.c,v 1.22 1996/07/05 08:35:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -171,7 +171,7 @@ menu_height(DMenu *menu, int n)
int max;
char *t;
for (t = menu->title, max = MAX_MENU; *t; t++) {
for (t = menu->prompt, max = MAX_MENU; *t; t++) {
if (*t == '\n')
--max;
}

7
release/sysinstall/menus.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: menus.c,v 1.80 1996/07/08 12:00:43 jkh Exp $
* $Id: menus.c,v 1.81 1996/07/10 09:41:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -294,7 +294,7 @@ DMenu MenuInitial = {
{ "5 Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ "6 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "7 Fixit", "Go into repair mode with CDROM or floppy", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "8 Upgrade", "Upgrade an existing 2.0.5 system", NULL, installUpgrade },
{ "8 Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "9 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },
{ "0 Index", "Glossary of functions.", NULL, dmenuSubmenu, NULL, &MenuIndex },
{ NULL } },
@ -626,7 +626,8 @@ These select what we consider to be the most reasonable defaults for the\n\
type of system in question. If you would prefer to pick and choose the\n\
list of distributions yourself, simply select \"Custom\". You can also\n\
pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
When you are finished chose the Exit item or Cancel to abort.",
Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
{ { "1 Developer", "Full sources, binaries and doc but no games [180MB]",

7
usr.sbin/sade/Makefile
View File

@ -1,7 +1,6 @@
PROG= sysinstall
NOMAN= yes
CLEANFILES= makedevs.c rtermcap
DEBUG_FLAGS+= -g3
CLEANFILES+= makedevs.c rtermcap
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
@ -14,8 +13,8 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp

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

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: dmenu.c,v 1.21 1996/07/02 01:03:39 jkh Exp $
* $Id: dmenu.c,v 1.22 1996/07/05 08:35:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -171,7 +171,7 @@ menu_height(DMenu *menu, int n)
int max;
char *t;
for (t = menu->title, max = MAX_MENU; *t; t++) {
for (t = menu->prompt, max = MAX_MENU; *t; t++) {
if (*t == '\n')
--max;
}

7
usr.sbin/sade/menus.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: menus.c,v 1.80 1996/07/08 12:00:43 jkh Exp $
* $Id: menus.c,v 1.81 1996/07/10 09:41:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -294,7 +294,7 @@ DMenu MenuInitial = {
{ "5 Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ "6 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "7 Fixit", "Go into repair mode with CDROM or floppy", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "8 Upgrade", "Upgrade an existing 2.0.5 system", NULL, installUpgrade },
{ "8 Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "9 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },
{ "0 Index", "Glossary of functions.", NULL, dmenuSubmenu, NULL, &MenuIndex },
{ NULL } },
@ -626,7 +626,8 @@ These select what we consider to be the most reasonable defaults for the\n\
type of system in question. If you would prefer to pick and choose the\n\
list of distributions yourself, simply select \"Custom\". You can also\n\
pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
When you are finished chose the Exit item or Cancel to abort.",
Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
{ { "1 Developer", "Full sources, binaries and doc but no games [180MB]",

7
usr.sbin/sysinstall/Makefile
View File

@ -1,7 +1,6 @@
PROG= sysinstall
NOMAN= yes
CLEANFILES= makedevs.c rtermcap
DEBUG_FLAGS+= -g3
CLEANFILES+= makedevs.c rtermcap
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
@ -14,8 +13,8 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp

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

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: dmenu.c,v 1.21 1996/07/02 01:03:39 jkh Exp $
* $Id: dmenu.c,v 1.22 1996/07/05 08:35:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -171,7 +171,7 @@ menu_height(DMenu *menu, int n)
int max;
char *t;
for (t = menu->title, max = MAX_MENU; *t; t++) {
for (t = menu->prompt, max = MAX_MENU; *t; t++) {
if (*t == '\n')
--max;
}

7
usr.sbin/sysinstall/menus.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: menus.c,v 1.80 1996/07/08 12:00:43 jkh Exp $
* $Id: menus.c,v 1.81 1996/07/10 09:41:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -294,7 +294,7 @@ DMenu MenuInitial = {
{ "5 Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ "6 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "7 Fixit", "Go into repair mode with CDROM or floppy", NULL, dmenuSubmenu, NULL, &MenuFixit },
{ "8 Upgrade", "Upgrade an existing 2.0.5 system", NULL, installUpgrade },
{ "8 Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "9 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },
{ "0 Index", "Glossary of functions.", NULL, dmenuSubmenu, NULL, &MenuIndex },
{ NULL } },
@ -626,7 +626,8 @@ These select what we consider to be the most reasonable defaults for the\n\
type of system in question. If you would prefer to pick and choose the\n\
list of distributions yourself, simply select \"Custom\". You can also\n\
pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
When you are finished chose the Exit item or Cancel to abort.",
Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
{ { "1 Developer", "Full sources, binaries and doc but no games [180MB]",