summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-10-18 05:02:02 +0000
committerjkh <jkh@FreeBSD.org>1995-10-18 05:02:02 +0000
commitdef622e32ae27a74a1cf7ce446b74b6422d48e08 (patch)
treef93c8f49f67de0656fafb7c9079237cd789a14e8
parent6855a7ee1e57a9c0557fdbd7a18296365cf56eda (diff)
downloadFreeBSD-src-def622e32ae27a74a1cf7ce446b74b6422d48e08.zip
FreeBSD-src-def622e32ae27a74a1cf7ce446b74b6422d48e08.tar.gz
Some rethinks on the way the attribute interface worked (now that
I'm really, truly using it). Allow distribution fetch to get .info files from the root.flp OR the distribution in question, allowing us to add flexibility to the scheme. At some point, perhaps soon, the cached copy should probably go away entirely!
-rw-r--r--release/sysinstall/options.c6
-rw-r--r--usr.sbin/sysinstall/options.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c
index 78658f2..18485f6 100644
--- a/release/sysinstall/options.c
+++ b/release/sysinstall/options.c
@@ -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.11 1995/10/17 02:57:01 jkh Exp $
+ * $Id: options.c,v 1.12 1995/10/18 00:12:36 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -97,7 +97,7 @@ static Option Options[] = {
OPT_IS_VAR, "Please specify a full pathname to the HTML browser binary:", BROWSER_BINARY, varCheck },
{ "Config File", "Name of default configuration file for Load command (top menu)",
OPT_IS_VAR, "Please specify the name of a configuration file", CONFIG_FILE, varCheck },
-{ "Reset Flags", "Reset all flag values to defaults",
+{ "Use Defaults", "Reset all values to startup defaults",
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
{ NULL },
};
@@ -193,9 +193,7 @@ optionsEditor(char *str)
/* Names are painted somewhat gratuitously each time, but it's easier this way */
mvprintw(optrow, OPT_NAME_COL + optcol, Options[i].name);
if (currOpt == i) standout();
- attron(A_UNDERLINE);
mvprintw(optrow++, OPT_VALUE_COL + optcol, value_of(Options[i]));
- attroff(A_UNDERLINE);
if (currOpt == i) standend();
if (optrow == OPT_END_ROW) {
optrow = OPT_START_ROW;
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 78658f2..18485f6 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -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.11 1995/10/17 02:57:01 jkh Exp $
+ * $Id: options.c,v 1.12 1995/10/18 00:12:36 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -97,7 +97,7 @@ static Option Options[] = {
OPT_IS_VAR, "Please specify a full pathname to the HTML browser binary:", BROWSER_BINARY, varCheck },
{ "Config File", "Name of default configuration file for Load command (top menu)",
OPT_IS_VAR, "Please specify the name of a configuration file", CONFIG_FILE, varCheck },
-{ "Reset Flags", "Reset all flag values to defaults",
+{ "Use Defaults", "Reset all values to startup defaults",
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
{ NULL },
};
@@ -193,9 +193,7 @@ optionsEditor(char *str)
/* Names are painted somewhat gratuitously each time, but it's easier this way */
mvprintw(optrow, OPT_NAME_COL + optcol, Options[i].name);
if (currOpt == i) standout();
- attron(A_UNDERLINE);
mvprintw(optrow++, OPT_VALUE_COL + optcol, value_of(Options[i]));
- attroff(A_UNDERLINE);
if (currOpt == i) standend();
if (optrow == OPT_END_ROW) {
optrow = OPT_START_ROW;
OpenPOWER on IntegriCloud