d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style police throughout.

Browse Source 
Fix the ppp startup code.
Make the disklabel and fdisk screens "automatable"
This commit is contained in:
jkh 1995-10-22 01:33:02 +00:00
parent 16a1354736
commit 1d0b031279
9 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/sysinstall/doc.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: doc.c,v 1.1 1995/10/20 07:03:40 jkh Exp $
* $Id: doc.c,v 1.2 1995/10/20 14:24:41 jkh Exp $
*
* Jordan Hubbard
*
@ -25,7 +25,7 @@
int
docBrowser(char *junk)
{
char *browser = variable_get(BROWSER_PACKAGE);
char *browser = variable_get(VAR_BROWSER_PACKAGE);
/* Make sure we were started at a reasonable time */
if (!strcmp(variable_get(SYSTEM_STATE), "init")) {
@ -44,14 +44,14 @@ docBrowser(char *junk)
"try again.", browser);
return RET_FAIL;
}
if (!file_executable(variable_get(BROWSER_BINARY))) {
if (!file_executable(variable_get(VAR_BROWSER_BINARY))) {
if (!msgYesNo("Hmmm. The %s package claims to have installed, but I can't\n"
"find its binary in %s! You may wish to try a different\n"
"location to load the package from (go to Media menu) and see if that\n"
"makes a difference.\n\n"
"I suggest that we remove the version that was extracted since it does\n"
"not appear to be correct. Would you like me to do that now?"))
vsystem("pkg_delete %s %s", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v" : "", browser);
vsystem("pkg_delete %s %s", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v" : "", browser);
return RET_FAIL;
}
@ -64,7 +64,7 @@ docBrowser(char *junk)
int
docShowDocument(char *str)
{
char *browser = variable_get(BROWSER_BINARY);
char *browser = variable_get(VAR_BROWSER_BINARY);
if (!file_executable(browser)) {
msgConfirm("Can't find the browser in %s! Please ensure that it's\n"

4
release/sysinstall/index.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: index.c,v 1.13 1995/10/20 21:57:08 jkh Exp $
* $Id: index.c,v 1.14 1995/10/21 14:06:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -558,7 +558,7 @@ index_extract(Device *dev, PkgNodePtr plist)
for (tmp = plist->kids; tmp; tmp = tmp->next) {
if (package_extract(dev, tmp->name) != RET_SUCCESS) {
if (variable_get(OPT_NO_CONFIRM))
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to locate package %s..", tmp->name);
else
msgConfirm("Unable to locate package %s..", tmp->name);

4
release/sysinstall/installPreconfig.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: installPreconfig.c,v 1.2 1995/10/20 16:49:46 jkh Exp $
* $Id: installPreconfig.c,v 1.4 1995/10/20 21:57:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -136,7 +136,7 @@ installPreconfig(char *str)
i = RET_FAIL;
while (1) {
if (!(cfg_file = variable_get_value(CONFIG_FILE,
if (!(cfg_file = variable_get_value(VAR_CONFIG_FILE,
"Please insert the floppy containing this configuration file\n"
"into drive A now and press [ENTER].")))
break;

28
release/sysinstall/options.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: options.c,v 1.20 1995/10/21 14:06:59 jkh Exp $
* $Id: options.c,v 1.22 1995/10/21 18:28:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -108,31 +108,31 @@ mediaCheck(Option opt)
static Option Options[] = {
{ "NFS Secure", "NFS server talks only on a secure port",
OPT_IS_VAR, NULL, OPT_NFS_SECURE, varCheck },
OPT_IS_VAR, NULL, VAR_NFS_SECURE, varCheck },
{ "NFS Slow", "User is using a slow PC or ethernet card",
OPT_IS_VAR, NULL, OPT_SLOW_ETHER, varCheck },
OPT_IS_VAR, NULL, VAR_SLOW_ETHER, varCheck },
{ "Debugging", "Emit extra debugging output on VTY2 (ALT-F2)",
OPT_IS_VAR, NULL, OPT_DEBUG, varCheck },
OPT_IS_VAR, NULL, VAR_DEBUG, varCheck },
{ "Yes to All", "Assume \"Yes\" answers to all non-critical dialogs",
OPT_IS_VAR, NULL, OPT_NO_CONFIRM, varCheck },
OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck },
{ "FTP OnError", "What to do when FTP requests fail: abort, retry, reselect.",
OPT_IS_FUNC, mediaSetFtpOnError, OPT_FTP_ONERROR, varCheck },
OPT_IS_FUNC, mediaSetFtpOnError, VAR_FTP_ONERROR, varCheck },
{ "FTP username", "Username and password to use instead of anonymous",
OPT_IS_FUNC, mediaSetFtpUserPass, FTP_USER, varCheck },
OPT_IS_FUNC, mediaSetFtpUserPass, VAR_FTP_USER, varCheck },
{ "Tape Blocksize", "Tape media block size in 512 byte blocks",
OPT_IS_VAR, TAPE_PROMPT, TAPE_BLOCKSIZE, varCheck },
OPT_IS_VAR, TAPE_PROMPT, VAR_TAPE_BLOCKSIZE, varCheck },
{ "Extract Detail", "How verbosely to display file name information during extractions",
OPT_IS_FUNC, mediaSetCPIOVerbosity, CPIO_VERBOSITY_LEVEL, varCheck },
OPT_IS_FUNC, mediaSetCPIOVerbosity, VAR_CPIO_VERBOSITY, varCheck },
{ "Release Name", "Which release to attempt to load from installation media",
OPT_IS_VAR, RELNAME_PROMPT, RELNAME, varCheck },
OPT_IS_VAR, RELNAME_PROMPT, VAR_RELNAME, varCheck },
{ "Browser Pkg", "This is the browser package that will be used for viewing HTML",
OPT_IS_VAR, BPKG_PROMPT, BROWSER_PACKAGE, varCheck },
OPT_IS_VAR, BPKG_PROMPT, VAR_BROWSER_PACKAGE, varCheck },
{ "Browser Exec", "This is the path to the main binary of the browser package",
OPT_IS_VAR, BBIN_PROMPT, BROWSER_BINARY, varCheck },
OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck },
{ "Config File", "Name of default configuration file for Load command (top menu)",
OPT_IS_VAR, CONFIG_PROMPT, CONFIG_FILE, varCheck },
OPT_IS_VAR, CONFIG_PROMPT, VAR_CONFIG_FILE, varCheck },
{ "Media Type", "The current installation media type.",
OPT_IS_FUNC, mediaGetType, MEDIA_TYPE, mediaCheck },
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
{ "Use Defaults", "Reset all values to startup defaults",
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
{ NULL },

6
release/sysinstall/package.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: package.c,v 1.7 1995/10/20 22:36:06 jkh Exp $
* $Id: package.c,v 1.8 1995/10/21 20:03:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -85,7 +85,7 @@ package_extract(Device *dev, char *name)
tpid = fork();
if (!tpid) {
dup2(fd, 0);
i = vsystem("tar %s-xzf -", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "");
i = vsystem("tar %s-xzf -", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : "");
if (isDebug())
msgDebug("tar command returns %d status\n", i);
exit(i);
@ -95,7 +95,7 @@ package_extract(Device *dev, char *name)
tpid = waitpid(tpid, &pstat, 0);
if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S",
!strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : ""))
!strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : ""))
msgConfirm("An error occurred while trying to pkg_add %s.\n"
"Please check debugging screen for possible further details.", path);
else

10
usr.sbin/sysinstall/doc.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: doc.c,v 1.1 1995/10/20 07:03:40 jkh Exp $
* $Id: doc.c,v 1.2 1995/10/20 14:24:41 jkh Exp $
*
* Jordan Hubbard
*
@ -25,7 +25,7 @@
int
docBrowser(char *junk)
{
char *browser = variable_get(BROWSER_PACKAGE);
char *browser = variable_get(VAR_BROWSER_PACKAGE);
/* Make sure we were started at a reasonable time */
if (!strcmp(variable_get(SYSTEM_STATE), "init")) {
@ -44,14 +44,14 @@ docBrowser(char *junk)
"try again.", browser);
return RET_FAIL;
}
if (!file_executable(variable_get(BROWSER_BINARY))) {
if (!file_executable(variable_get(VAR_BROWSER_BINARY))) {
if (!msgYesNo("Hmmm. The %s package claims to have installed, but I can't\n"
"find its binary in %s! You may wish to try a different\n"
"location to load the package from (go to Media menu) and see if that\n"
"makes a difference.\n\n"
"I suggest that we remove the version that was extracted since it does\n"
"not appear to be correct. Would you like me to do that now?"))
vsystem("pkg_delete %s %s", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v" : "", browser);
vsystem("pkg_delete %s %s", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v" : "", browser);
return RET_FAIL;
}
@ -64,7 +64,7 @@ docBrowser(char *junk)
int
docShowDocument(char *str)
{
char *browser = variable_get(BROWSER_BINARY);
char *browser = variable_get(VAR_BROWSER_BINARY);
if (!file_executable(browser)) {
msgConfirm("Can't find the browser in %s! Please ensure that it's\n"

4
usr.sbin/sysinstall/index.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: index.c,v 1.13 1995/10/20 21:57:08 jkh Exp $
* $Id: index.c,v 1.14 1995/10/21 14:06:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -558,7 +558,7 @@ index_extract(Device *dev, PkgNodePtr plist)
for (tmp = plist->kids; tmp; tmp = tmp->next) {
if (package_extract(dev, tmp->name) != RET_SUCCESS) {
if (variable_get(OPT_NO_CONFIRM))
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to locate package %s..", tmp->name);
else
msgConfirm("Unable to locate package %s..", tmp->name);

28
usr.sbin/sysinstall/options.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: options.c,v 1.20 1995/10/21 14:06:59 jkh Exp $
* $Id: options.c,v 1.22 1995/10/21 18:28:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -108,31 +108,31 @@ mediaCheck(Option opt)
static Option Options[] = {
{ "NFS Secure", "NFS server talks only on a secure port",
OPT_IS_VAR, NULL, OPT_NFS_SECURE, varCheck },
OPT_IS_VAR, NULL, VAR_NFS_SECURE, varCheck },
{ "NFS Slow", "User is using a slow PC or ethernet card",
OPT_IS_VAR, NULL, OPT_SLOW_ETHER, varCheck },
OPT_IS_VAR, NULL, VAR_SLOW_ETHER, varCheck },
{ "Debugging", "Emit extra debugging output on VTY2 (ALT-F2)",
OPT_IS_VAR, NULL, OPT_DEBUG, varCheck },
OPT_IS_VAR, NULL, VAR_DEBUG, varCheck },
{ "Yes to All", "Assume \"Yes\" answers to all non-critical dialogs",
OPT_IS_VAR, NULL, OPT_NO_CONFIRM, varCheck },
OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck },
{ "FTP OnError", "What to do when FTP requests fail: abort, retry, reselect.",
OPT_IS_FUNC, mediaSetFtpOnError, OPT_FTP_ONERROR, varCheck },
OPT_IS_FUNC, mediaSetFtpOnError, VAR_FTP_ONERROR, varCheck },
{ "FTP username", "Username and password to use instead of anonymous",
OPT_IS_FUNC, mediaSetFtpUserPass, FTP_USER, varCheck },
OPT_IS_FUNC, mediaSetFtpUserPass, VAR_FTP_USER, varCheck },
{ "Tape Blocksize", "Tape media block size in 512 byte blocks",
OPT_IS_VAR, TAPE_PROMPT, TAPE_BLOCKSIZE, varCheck },
OPT_IS_VAR, TAPE_PROMPT, VAR_TAPE_BLOCKSIZE, varCheck },
{ "Extract Detail", "How verbosely to display file name information during extractions",
OPT_IS_FUNC, mediaSetCPIOVerbosity, CPIO_VERBOSITY_LEVEL, varCheck },
OPT_IS_FUNC, mediaSetCPIOVerbosity, VAR_CPIO_VERBOSITY, varCheck },
{ "Release Name", "Which release to attempt to load from installation media",
OPT_IS_VAR, RELNAME_PROMPT, RELNAME, varCheck },
OPT_IS_VAR, RELNAME_PROMPT, VAR_RELNAME, varCheck },
{ "Browser Pkg", "This is the browser package that will be used for viewing HTML",
OPT_IS_VAR, BPKG_PROMPT, BROWSER_PACKAGE, varCheck },
OPT_IS_VAR, BPKG_PROMPT, VAR_BROWSER_PACKAGE, varCheck },
{ "Browser Exec", "This is the path to the main binary of the browser package",
OPT_IS_VAR, BBIN_PROMPT, BROWSER_BINARY, varCheck },
OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck },
{ "Config File", "Name of default configuration file for Load command (top menu)",
OPT_IS_VAR, CONFIG_PROMPT, CONFIG_FILE, varCheck },
OPT_IS_VAR, CONFIG_PROMPT, VAR_CONFIG_FILE, varCheck },
{ "Media Type", "The current installation media type.",
OPT_IS_FUNC, mediaGetType, MEDIA_TYPE, mediaCheck },
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
{ "Use Defaults", "Reset all values to startup defaults",
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
{ NULL },

6
usr.sbin/sysinstall/package.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: package.c,v 1.7 1995/10/20 22:36:06 jkh Exp $
* $Id: package.c,v 1.8 1995/10/21 20:03:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -85,7 +85,7 @@ package_extract(Device *dev, char *name)
tpid = fork();
if (!tpid) {
dup2(fd, 0);
i = vsystem("tar %s-xzf -", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "");
i = vsystem("tar %s-xzf -", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : "");
if (isDebug())
msgDebug("tar command returns %d status\n", i);
exit(i);
@ -95,7 +95,7 @@ package_extract(Device *dev, char *name)
tpid = waitpid(tpid, &pstat, 0);
if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S",
!strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : ""))
!strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v " : ""))
msgConfirm("An error occurred while trying to pkg_add %s.\n"
"Please check debugging screen for possible further details.", path);
else