mirror of
https://github.com/opnsense/src.git
synced 2026-04-27 00:58:36 -04:00
YAMF22
This commit is contained in:
Jordan K. Hubbard
parent
aab4ac4dad
commit
38abfbea7d
11 changed files with 66 additions and 46 deletions
|
|
@ -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.102 1997/03/11 17:50:59 jkh Exp $
|
||||
* $Id: dist.c,v 1.103 1997/03/15 18:01:35 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -665,7 +665,7 @@ distExtractAll(dialogMenuItem *self)
|
|||
|
||||
/* paranoia */
|
||||
if (!Dists) {
|
||||
if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists)
|
||||
if (!dmenuOpenSimple(&MenuDistributions, FALSE) || !Dists)
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
|
|
@ -691,5 +691,3 @@ distExtractAll(dialogMenuItem *self)
|
|||
}
|
||||
return DITEM_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: index.c,v 1.45 1997/02/07 04:26:10 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -56,12 +56,11 @@ _strdup(char *ptr)
|
|||
}
|
||||
|
||||
static char *descrs[] = {
|
||||
"Package Selection", "To mark a package or select a category, move to it and press SPACE.\n"
|
||||
"To unmark a package, press SPACE again. To go to a previous menu,\n"
|
||||
"select the Cancel button. To search for a package by name, press ESC.\n"
|
||||
"To finally extract packages, you should Cancel all the way out of any\n"
|
||||
"submenus and then this top menu. NOTE: The All category selection\n"
|
||||
"creates a very large submenu. If you select it, please be patient.",
|
||||
"Package Selection", "To mark a package, move to it and press SPACE. If the package is\n"
|
||||
"already marked, it will be unmarked or deleted (if installed).\n"
|
||||
"To search for a package by name, press ESC. To select a category,\n"
|
||||
"press RETURN. NOTE: The All category selection creates a very large\n"
|
||||
"submenu. If you select it, please be patient while it comes up.",
|
||||
"Package Targets", "These are the packages you've selected for extraction.\n\n"
|
||||
"If you're sure of these choices, select OK.\n"
|
||||
"If not, select Cancel to go back to the package selection menu.\n",
|
||||
|
|
@ -85,6 +84,7 @@ static char *descrs[] = {
|
|||
"games", "Various and sundry amusements.",
|
||||
"graphics", "Graphics libraries and utilities.",
|
||||
"japanese", "Ported software for the Japanese market.",
|
||||
"korean", "Ported software for the Korean market.",
|
||||
"lang", "Computer languages.",
|
||||
"languages", "Computer languages.",
|
||||
"libraries", "Software development libraries.",
|
||||
|
|
@ -482,12 +482,22 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
|||
while (1) {
|
||||
n = 0;
|
||||
curr = max = 0;
|
||||
use_helpline(NULL);
|
||||
use_helpfile(NULL);
|
||||
kp = top->kids;
|
||||
if (!hasPackages && plist) {
|
||||
nitems = item_add(nitems, " OK ", NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
nitems = item_add(nitems, " Install ", NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
}
|
||||
while (kp && kp->name) {
|
||||
char buf[256];
|
||||
IndexEntryPtr ie = kp->data;
|
||||
|
||||
/* Brutally adjust description to fit in menu */
|
||||
SAFE_STRCPY(buf, kp->desc);
|
||||
if (kp->type == PACKAGE)
|
||||
snprintf(buf, sizeof buf, "[%s]", ie->path ? ie->path : "External vendor");
|
||||
else
|
||||
SAFE_STRCPY(buf, kp->desc);
|
||||
if (strlen(buf) > (_MAX_DESC - maxname))
|
||||
buf[_MAX_DESC - maxname] = '\0';
|
||||
nitems = item_add(nitems, kp->name, buf, pkg_checked, pkg_fire, pkg_selected, kp, (int)plist, &curr, &max);
|
||||
|
|
@ -501,9 +511,8 @@ recycle:
|
|||
dialog_clear_norefresh();
|
||||
if (hasPackages)
|
||||
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
|
||||
else /* It's a categories menu */
|
||||
rval = dialog_menu(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n,
|
||||
nitems, NULL, pos, scroll);
|
||||
else
|
||||
rval = dialog_menu(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems + (plist ? 2 : 0), (char *)plist, pos, scroll);
|
||||
if (rval == -1 && plist) {
|
||||
static char *cp;
|
||||
PkgNodePtr menu;
|
||||
|
|
|
|||
|
|
@ -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.177 1997/03/10 21:11:55 jkh Exp $
|
||||
* $Id: install.c,v 1.178 1997/03/18 07:02:32 mpp Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -971,6 +971,7 @@ installVarDefaults(dialogMenuItem *self)
|
|||
variable_set2(VAR_BROWSER_PACKAGE, PACKAGE_LYNX);
|
||||
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_NFS_SECURE, "YES");
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
variable_set2(VAR_APACHE_PKG, PACKAGE_APACHE);
|
||||
variable_set2(VAR_SAMBA_PKG, PACKAGE_SAMBA);
|
||||
|
|
|
|||
|
|
@ -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.127 1997/03/19 10:09:22 jkh Exp $
|
||||
* $Id: menus.c,v 1.128 1997/03/21 05:18:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -285,7 +285,7 @@ DMenu MenuIndex = {
|
|||
/* The initial installation menu */
|
||||
DMenu MenuInitial = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"Welcome to FreeBSD!", /* title */
|
||||
"Welcome to FreeBSD! [" RELEASE_NAME "]", /* title */
|
||||
"This is the main menu of the FreeBSD installation system. Please\n" /* prompt */
|
||||
"select one of the options below by using the arrow keys or typing the\n"
|
||||
"first character of the option name you're interested in. Invoke an\n"
|
||||
|
|
@ -571,9 +571,9 @@ DMenu MenuMediaFTP = {
|
|||
{ "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/mirrors/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/unix/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: register.c,v 1.4 1997/03/15 16:24:31 jkh Exp $
|
||||
* $Id: register.c,v 1.5 1997/03/19 10:09:24 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1997
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -196,6 +196,7 @@ handle_registration(void)
|
|||
if (hotspots[ANNOUNCE_LIST].sel) {
|
||||
char *cp;
|
||||
|
||||
dialog_clear_norefresh();
|
||||
cp = msgGetInput(email, "What email address would you like to subscribe under?\n"
|
||||
"This is a fairly low-traffic mailing list and only generates\n"
|
||||
"around 5 messages a month, so it's also safe to receive at your\n"
|
||||
|
|
@ -204,6 +205,7 @@ handle_registration(void)
|
|||
msgConfirm("OK, I won't subscribe to announce at this time. To do it manually\n"
|
||||
"yourself, simply send mail to %s.", MAJORDOMO_ADDRESS);
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
if (!vsystem("echo subscribe freebsd-announce %s | mail %s", email, MAJORDOMO_ADDRESS))
|
||||
msgConfirm("Your request to join the announce mailing list has been sent.\n"
|
||||
"you should receive notification back in 24 hours or less, otherwise\n"
|
||||
|
|
@ -220,6 +222,7 @@ handle_registration(void)
|
|||
}
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("OK, your registration has been left in the file %s\n"
|
||||
"When you're connected to the net and ready to send it,\n"
|
||||
"simply type: mail %s < %s\n", REGISTRATION_FNAME,
|
||||
|
|
|
|||
|
|
@ -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.177 1997/03/10 21:11:55 jkh Exp $
|
||||
* $Id: install.c,v 1.178 1997/03/18 07:02:32 mpp Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -971,6 +971,7 @@ installVarDefaults(dialogMenuItem *self)
|
|||
variable_set2(VAR_BROWSER_PACKAGE, PACKAGE_LYNX);
|
||||
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_NFS_SECURE, "YES");
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
variable_set2(VAR_APACHE_PKG, PACKAGE_APACHE);
|
||||
variable_set2(VAR_SAMBA_PKG, PACKAGE_SAMBA);
|
||||
|
|
|
|||
|
|
@ -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.127 1997/03/19 10:09:22 jkh Exp $
|
||||
* $Id: menus.c,v 1.128 1997/03/21 05:18:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -285,7 +285,7 @@ DMenu MenuIndex = {
|
|||
/* The initial installation menu */
|
||||
DMenu MenuInitial = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"Welcome to FreeBSD!", /* title */
|
||||
"Welcome to FreeBSD! [" RELEASE_NAME "]", /* title */
|
||||
"This is the main menu of the FreeBSD installation system. Please\n" /* prompt */
|
||||
"select one of the options below by using the arrow keys or typing the\n"
|
||||
"first character of the option name you're interested in. Invoke an\n"
|
||||
|
|
@ -571,9 +571,9 @@ DMenu MenuMediaFTP = {
|
|||
{ "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/mirrors/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/unix/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
|
|
|
|||
|
|
@ -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.102 1997/03/11 17:50:59 jkh Exp $
|
||||
* $Id: dist.c,v 1.103 1997/03/15 18:01:35 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -665,7 +665,7 @@ distExtractAll(dialogMenuItem *self)
|
|||
|
||||
/* paranoia */
|
||||
if (!Dists) {
|
||||
if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists)
|
||||
if (!dmenuOpenSimple(&MenuDistributions, FALSE) || !Dists)
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
|
|
@ -691,5 +691,3 @@ distExtractAll(dialogMenuItem *self)
|
|||
}
|
||||
return DITEM_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: index.c,v 1.45 1997/02/07 04:26:10 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -56,12 +56,11 @@ _strdup(char *ptr)
|
|||
}
|
||||
|
||||
static char *descrs[] = {
|
||||
"Package Selection", "To mark a package or select a category, move to it and press SPACE.\n"
|
||||
"To unmark a package, press SPACE again. To go to a previous menu,\n"
|
||||
"select the Cancel button. To search for a package by name, press ESC.\n"
|
||||
"To finally extract packages, you should Cancel all the way out of any\n"
|
||||
"submenus and then this top menu. NOTE: The All category selection\n"
|
||||
"creates a very large submenu. If you select it, please be patient.",
|
||||
"Package Selection", "To mark a package, move to it and press SPACE. If the package is\n"
|
||||
"already marked, it will be unmarked or deleted (if installed).\n"
|
||||
"To search for a package by name, press ESC. To select a category,\n"
|
||||
"press RETURN. NOTE: The All category selection creates a very large\n"
|
||||
"submenu. If you select it, please be patient while it comes up.",
|
||||
"Package Targets", "These are the packages you've selected for extraction.\n\n"
|
||||
"If you're sure of these choices, select OK.\n"
|
||||
"If not, select Cancel to go back to the package selection menu.\n",
|
||||
|
|
@ -85,6 +84,7 @@ static char *descrs[] = {
|
|||
"games", "Various and sundry amusements.",
|
||||
"graphics", "Graphics libraries and utilities.",
|
||||
"japanese", "Ported software for the Japanese market.",
|
||||
"korean", "Ported software for the Korean market.",
|
||||
"lang", "Computer languages.",
|
||||
"languages", "Computer languages.",
|
||||
"libraries", "Software development libraries.",
|
||||
|
|
@ -482,12 +482,22 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
|||
while (1) {
|
||||
n = 0;
|
||||
curr = max = 0;
|
||||
use_helpline(NULL);
|
||||
use_helpfile(NULL);
|
||||
kp = top->kids;
|
||||
if (!hasPackages && plist) {
|
||||
nitems = item_add(nitems, " OK ", NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
nitems = item_add(nitems, " Install ", NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
}
|
||||
while (kp && kp->name) {
|
||||
char buf[256];
|
||||
IndexEntryPtr ie = kp->data;
|
||||
|
||||
/* Brutally adjust description to fit in menu */
|
||||
SAFE_STRCPY(buf, kp->desc);
|
||||
if (kp->type == PACKAGE)
|
||||
snprintf(buf, sizeof buf, "[%s]", ie->path ? ie->path : "External vendor");
|
||||
else
|
||||
SAFE_STRCPY(buf, kp->desc);
|
||||
if (strlen(buf) > (_MAX_DESC - maxname))
|
||||
buf[_MAX_DESC - maxname] = '\0';
|
||||
nitems = item_add(nitems, kp->name, buf, pkg_checked, pkg_fire, pkg_selected, kp, (int)plist, &curr, &max);
|
||||
|
|
@ -501,9 +511,8 @@ recycle:
|
|||
dialog_clear_norefresh();
|
||||
if (hasPackages)
|
||||
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
|
||||
else /* It's a categories menu */
|
||||
rval = dialog_menu(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n,
|
||||
nitems, NULL, pos, scroll);
|
||||
else
|
||||
rval = dialog_menu(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems + (plist ? 2 : 0), (char *)plist, pos, scroll);
|
||||
if (rval == -1 && plist) {
|
||||
static char *cp;
|
||||
PkgNodePtr menu;
|
||||
|
|
|
|||
|
|
@ -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.177 1997/03/10 21:11:55 jkh Exp $
|
||||
* $Id: install.c,v 1.178 1997/03/18 07:02:32 mpp Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -971,6 +971,7 @@ installVarDefaults(dialogMenuItem *self)
|
|||
variable_set2(VAR_BROWSER_PACKAGE, PACKAGE_LYNX);
|
||||
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_NFS_SECURE, "YES");
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
variable_set2(VAR_APACHE_PKG, PACKAGE_APACHE);
|
||||
variable_set2(VAR_SAMBA_PKG, PACKAGE_SAMBA);
|
||||
|
|
|
|||
|
|
@ -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.127 1997/03/19 10:09:22 jkh Exp $
|
||||
* $Id: menus.c,v 1.128 1997/03/21 05:18:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -285,7 +285,7 @@ DMenu MenuIndex = {
|
|||
/* The initial installation menu */
|
||||
DMenu MenuInitial = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"Welcome to FreeBSD!", /* title */
|
||||
"Welcome to FreeBSD! [" RELEASE_NAME "]", /* title */
|
||||
"This is the main menu of the FreeBSD installation system. Please\n" /* prompt */
|
||||
"select one of the options below by using the arrow keys or typing the\n"
|
||||
"first character of the option name you're interested in. Invoke an\n"
|
||||
|
|
@ -571,9 +571,9 @@ DMenu MenuMediaFTP = {
|
|||
{ "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/mirrors/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/unix/FreeBSD/" },
|
||||
VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
|
||||
{ "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
|
||||
|
|
|
|||
Loading…
Reference in a new issue