nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more early config file pass

Browse Source 
Because some optlist entries were ignored in the early pass,
some non OPTIONS= lines in the config file were having issues
due to those options not being set.

Extend what is being disregarded in the early config file pass
to include other config file statements.
This commit is contained in:
nhmall
2026-04-07 14:22:07 -04:00
parent cf7a514596
commit 8cbbb74f3b
3 changed files with 85 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/extern.h
View File

@@ -337,6 +337,13 @@ extern char *get_configfile(void);
extern const char *get_default_configfile(void);
extern void rcfile(void);
extern void rcfile_interface_options(void);
extern void heed_all_config_statements(void);
extern void disregard_all_config_statements(void);
extern void heed_this_config_statement(int);
extern void disregard_this_config_statement(int);
extern boolean config_unmatched_ignored(void);
extern void clear_ignore_errors_on_unmatched(void);
extern void set_ignore_errors_on_unmatched(void);
/* ### coloratt.c ### */
@@ -2322,10 +2329,11 @@ extern int msgtype_type(const char *, boolean) NONNULLARG1;
extern void hide_unhide_msgtypes(boolean, int);
extern void msgtype_free(void);
extern void options_free_window_colors(void);
extern void set_all_options_heeded(void);
extern void set_all_options_disregarded(void);
extern void heed_all_options(void);
extern void disregard_all_options(void);
extern void heed_this_option(enum opt);
extern void disregard_this_option(enum opt);
extern void clear_ignore_errors_on_unmatched(void);
#ifdef TTY_PERM_INVENT
extern void check_perm_invent_again(void);
#endif

74
src/cfgfiles.c
View File

@@ -110,6 +110,7 @@ staticfn void parse_conf_buf(struct _cnf_parser_state *parser,
boolean (*proc)(char *arg));
/* next one is in extern.h; why here too? */
boolean parse_conf_str(const char *str, boolean (*proc)(char *arg));
static boolean ignore_errors_on_unmatched = FALSE;
#ifdef SFCTOOL
#ifdef wait_synch
@@ -1203,7 +1204,8 @@ cnf_line_SYMBOLS(char *bufp)
switch_symbols(TRUE);
return TRUE;
}
config_error_add("Error in SYMBOLS definition '%s'", bufp);
if (!config_unmatched_ignored())
config_error_add("Error in SYMBOLS definition '%s'", bufp);
return FALSE;
}
@@ -1295,7 +1297,7 @@ typedef boolean (*config_line_stmt_func)(char *);
/* normal, alias */
#define CNFL_NA(n, l, f) { #n, l, FALSE, FALSE, cnf_line_##f }
/* sysconf only */
#define CNFL_S(n, l) { #n, l, TRUE, FALSE, cnf_line_##n }
#define CNFL_S(n, l) { #n, l, TRUE, FALSE, cnf_line_##n }
static const struct match_config_line_stmt {
const char *name;
@@ -1380,6 +1382,8 @@ static const struct match_config_line_stmt {
#undef CNFL_NA
#undef CNFL_S
static boolean disregarded_config_lines[SIZE(config_line_stmt)];
boolean
parse_config_line(char *origbuf)
{
@@ -1422,11 +1426,13 @@ parse_config_line(char *origbuf)
config_line_stmt[i].len)) {
char *parm = config_line_stmt[i].origbuf ? origbuf : bufp;
return config_line_stmt[i].fn(parm);
if (!disregarded_config_lines[i])
return config_line_stmt[i].fn(parm);
}
}
config_error_add("Unknown config statement");
if (!ignore_errors_on_unmatched)
config_error_add("Unknown config statement");
return FALSE;
}
@@ -1859,7 +1865,8 @@ config_error_add(const char *str, ...)
va_list the_args;
va_start(the_args, str);
vconfig_error_add(str, the_args);
if (!config_unmatched_ignored())
vconfig_error_add(str, the_args);
va_end(the_args);
}
@@ -1951,13 +1958,66 @@ void
rcfile_interface_options(void)
{
allopt_array_init();
set_all_options_disregarded();
disregard_all_options();
disregard_all_config_statements();
heed_this_option(opt_windowtype);
heed_this_option(opt_soundlib);
set_ignore_errors_on_unmatched();
rcfile();
set_all_options_heeded();
heed_all_config_statements();
heed_all_options();
disregard_this_option(opt_windowtype);
disregard_this_option(opt_soundlib);
clear_ignore_errors_on_unmatched();
}
void
heed_all_config_statements(void)
{
int i;
for (i = 0; i < SIZE(disregarded_config_lines); i++) {
disregarded_config_lines[i] = FALSE;
}
}
void
disregard_all_config_statements(void)
{
int i;
for (i = 0; i < SIZE(disregarded_config_lines); i++) {
disregarded_config_lines[i] = TRUE;
}
}
void
heed_this_config_statement(int statement_idx)
{
if (statement_idx >= 0 && statement_idx < SIZE(disregarded_config_lines))
disregarded_config_lines[statement_idx] = FALSE;
}
void
disregard_this_config_statement(int statement_idx)
{
if (statement_idx >= 0 && statement_idx < SIZE(disregarded_config_lines))
disregarded_config_lines[statement_idx] = TRUE;
}
void
clear_ignore_errors_on_unmatched(void)
{
ignore_errors_on_unmatched = FALSE;
}
void
set_ignore_errors_on_unmatched(void)
{
ignore_errors_on_unmatched = TRUE;
}
boolean
config_unmatched_ignored(void)
{
if (ignore_errors_on_unmatched)
return TRUE;
return FALSE;
}
#ifdef SYSCF

17
src/options.c
View File

@@ -106,7 +106,6 @@ extern char ttycolors[CLR_MAX]; /* in sys/msdos/video.c */
static char empty_optstr[] = { '\0' };
static boolean duplicate, using_alias;
static boolean give_opt_msg = TRUE;
static boolean restricted_options_mode = FALSE;
enum { MAX_ROLEOPT = 4 }; /* 4: role,race,gend,algn */
static boolean opt_set_in_config[OPTCOUNT];
@@ -668,7 +667,9 @@ parseoptions(
}
}
if (optresult == optn_silenterr || restricted_options_mode)
if (optresult == optn_silenterr
|| (got_match && allopt[matchidx].disregarded)
|| (!got_match && config_unmatched_ignored()))
return FALSE;
if (pfx_match && optresult == optn_err) {
char pfxbuf[BUFSZ], *pfxp;
@@ -7390,7 +7391,7 @@ allopt_array_init(void)
if (allopt[i].addr)
*(allopt[i].addr) = allopt[i].initval;
}
set_all_options_heeded();
heed_all_options();
/*
* Call each option function with an init flag and give it a chance
* to make any preparations that it might require. We do this
@@ -10180,23 +10181,21 @@ enhance_menu_text(
}
void
set_all_options_heeded(void)
heed_all_options(void)
{
int i;
for (i = 0; i < OPTCOUNT; i++)
allopt[i].disregarded = FALSE;
restricted_options_mode = FALSE;
}
void
set_all_options_disregarded(void)
disregard_all_options(void)
{
int i;
for (i = 0; i < OPTCOUNT ; i++)
allopt[i].disregarded = TRUE;
restricted_options_mode = TRUE;
}
void
@@ -10210,10 +10209,10 @@ disregard_this_option(enum opt optidx)
{
if (optidx >= 0 && optidx < (enum opt) OPTCOUNT)
allopt[optidx].disregarded = TRUE;
if (!restricted_options_mode)
restricted_options_mode = TRUE;
}
#undef OPTIONS_HEADING
#undef CONFIG_SLOT