|
@@ -1,3 +1,4 @@
|
|
|
+#include "common.h"
|
|
|
#include "sysvars.h"
|
|
|
|
|
|
#include <stdlib.h>
|
|
@@ -5,6 +6,12 @@
|
|
|
#include <stdio.h>
|
|
|
#include <time.h>
|
|
|
|
|
|
+#define DEBUG 1
|
|
|
+
|
|
|
+#ifndef DEBUG
|
|
|
+# define DEBUG 0
|
|
|
+#endif
|
|
|
+
|
|
|
static const char *sysvar_bool_tostr(sysvar_t from, char *buf)
|
|
|
{
|
|
|
buf[0] = '0' + from.v_bool;
|
|
@@ -266,6 +273,13 @@ static bool do_setvar(size_t var, sysvar_t val, bool is_set)
|
|
|
if (type->datasize)
|
|
|
free_ptr = to->v_ptr;
|
|
|
|
|
|
+ if (DEBUG) {
|
|
|
+ char tostr_buf[SYSVAR_BUFLEN];
|
|
|
+ printf("%ssetvar %zu %s <- %s\n", is_set ? "" : "un",
|
|
|
+ var, sysvar_name[var],
|
|
|
+ notempty(type->tostr(val, tostr_buf)));
|
|
|
+ }
|
|
|
+
|
|
|
if (!type->set || (type->datasize && !val.v_ptr)) {
|
|
|
sysvar_val[var] = val;
|
|
|
} else {
|
|
@@ -336,6 +350,10 @@ bool setvar_fromstr(size_t var, const char *str)
|
|
|
if (type->datasize)
|
|
|
free_ptr = to->v_ptr;
|
|
|
|
|
|
+ if (DEBUG) {
|
|
|
+ printf("setvar_fromstr %zu %s <- %s\n", var, sysvar_name[var], str);
|
|
|
+ }
|
|
|
+
|
|
|
/* A fromstr method is required */
|
|
|
if (!type->fromstr(to, str))
|
|
|
return false;
|
|
@@ -368,8 +386,8 @@ size_t sysvar_find(size_t ns, const char *name)
|
|
|
const char * const *varname;
|
|
|
const size_t count = nsi[1].first - nsi->first;
|
|
|
|
|
|
- varname = bsearch(name, sysvar_name + nsi->first,
|
|
|
- count, sizeof(const char *),
|
|
|
+ varname = bsearch(&name, sysvar_name + nsi->first,
|
|
|
+ count, sizeof *sysvar_name,
|
|
|
string_ptr_compare);
|
|
|
if (!varname)
|
|
|
return 0;
|
|
@@ -379,10 +397,23 @@ size_t sysvar_find(size_t ns, const char *name)
|
|
|
|
|
|
/* --- Initialization/reset to defaults --- */
|
|
|
|
|
|
-void sysvar_reset(void)
|
|
|
+void sysvar_reset(size_t ns)
|
|
|
+{
|
|
|
+ if (ns >= (size_t)sysvar_nscount)
|
|
|
+ return;
|
|
|
+
|
|
|
+ enum sysvar_enum i;
|
|
|
+ for (i = sysvar_ns[ns].first; i < sysvar_ns[ns+1].first; i++)
|
|
|
+ unsetvar(i);
|
|
|
+
|
|
|
+ if (sysvar_changed < i)
|
|
|
+ sysvar_changed = i;
|
|
|
+}
|
|
|
+
|
|
|
+void sysvar_init(void)
|
|
|
{
|
|
|
- for (enum sysvar_enum i = sysvar_null; i < sysvar_count; i++)
|
|
|
+ for (enum sysvar_enum i = sysvar_null+1; i < sysvar_count; i++)
|
|
|
unsetvar(i);
|
|
|
|
|
|
- sysvar_changed = sysvar_null;
|
|
|
+ sysvar_changed = sysvar_count;
|
|
|
}
|