|
@@ -36,19 +36,21 @@ int setenv_config(const char *name, const char *value)
|
|
|
int setenv_cond(const char *name, const char *value)
|
|
|
{
|
|
|
const char *pfx;
|
|
|
+ size_t skip;
|
|
|
|
|
|
- if (!strncmp("status.", name, 7))
|
|
|
- pfx = "STAT";
|
|
|
- else
|
|
|
- pfx = "CONF";
|
|
|
-
|
|
|
- if (value) {
|
|
|
- logmsg(pfx, "%s: %s\n", name, value);
|
|
|
- return setenv(name, value, 1);
|
|
|
+ if (!strncmp("status.", name, 7)) {
|
|
|
+ pfx = "STATUS";
|
|
|
+ skip = 7;
|
|
|
} else {
|
|
|
- logmsg(pfx, "%s: <deleted>\n", name);
|
|
|
- return unsetenv(name);
|
|
|
+ pfx = "CONFIG";
|
|
|
+ skip = 0;
|
|
|
}
|
|
|
+ logmsg(pfx, "%s <- %s\n", name+skip, value ? value : "(deleted)");
|
|
|
+
|
|
|
+ if (value)
|
|
|
+ return setenv(name, value, 1);
|
|
|
+ else
|
|
|
+ return unsetenv(name);
|
|
|
}
|
|
|
|
|
|
static void reset_config(void)
|
|
@@ -330,10 +332,10 @@ void log_config_status(void)
|
|
|
|
|
|
for (char **var = environ; *var; var++) {
|
|
|
if (!strncmp(*var, "status.", 7)) {
|
|
|
- pfx = "STAT";
|
|
|
+ pfx = "STATUS";
|
|
|
skip = 7;
|
|
|
} else {
|
|
|
- pfx = "CONF";
|
|
|
+ pfx = "CONFIG";
|
|
|
skip = 0;
|
|
|
}
|
|
|
logmsg(pfx, "%s\n", *var+skip);
|