summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-11-09 20:58:05 +0000
committerEric Andersen <andersen@codepoet.org>2002-11-09 20:58:05 +0000
commitb0ca0c39870912f7784a22df8f9e16f07fd3895d (patch)
treed26b7339056b588a26af094b145b4c20c1fe4e82
parentc159d8fb27d14f3e1fa8d743a30c652a6158eff2 (diff)
Update from upstream
-rw-r--r--extra/config/confdata.c14
-rw-r--r--extra/config/mconf.c6
2 files changed, 9 insertions, 11 deletions
diff --git a/extra/config/confdata.c b/extra/config/confdata.c
index 9e413b4a3..cb8a0e75d 100644
--- a/extra/config/confdata.c
+++ b/extra/config/confdata.c
@@ -7,7 +7,6 @@
*/
#include <ctype.h>
-#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -17,7 +16,6 @@
#include "lkc.h"
const char conf_def_filename[] = ".config";
-char conf_filename[PATH_MAX+1];
const char conf_defname[] = "extra/Configs/Config.$TARGET_ARCH.default";
@@ -71,8 +69,6 @@ int conf_read(const char *name)
if (name) {
in = fopen(name, "r");
- if (in)
- strcpy(conf_filename, name);
} else {
const char **names = conf_confnames;
while ((name = *names++)) {
@@ -91,16 +87,17 @@ int conf_read(const char *name)
return 1;
for_all_symbols(i, sym) {
- sym->flags |= SYMBOL_NEW;
+ sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED;
+ sym->flags &= ~SYMBOL_VALID;
switch (sym->type) {
case S_INT:
case S_HEX:
case S_STRING:
- if (S_VAL(sym->def)) {
+ if (S_VAL(sym->def))
free(S_VAL(sym->def));
- S_VAL(sym->def) = NULL;
- }
default:
+ S_VAL(sym->def) = NULL;
+ S_TRI(sym->def) = no;
;
}
}
@@ -372,7 +369,6 @@ int conf_write(const char *name)
rename(name, oldname);
if (rename(".tmpconfig", name))
return 1;
- strcpy(conf_filename, name);
sym_change_count = 0;
diff --git a/extra/config/mconf.c b/extra/config/mconf.c
index 27c0c5340..fd2941256 100644
--- a/extra/config/mconf.c
+++ b/extra/config/mconf.c
@@ -12,6 +12,7 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <signal.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -83,6 +84,7 @@ save_config_help[] =
static char buf[4096], *bufptr = buf;
static char input_buf[4096];
+static char filename[PATH_MAX+1] = ".config";
static char *args[1024], **argptr = args;
static int indent = 0;
static struct termios ios_org;
@@ -662,7 +664,7 @@ static void conf_load(void)
cprint(load_config_text);
cprint("11");
cprint("55");
- cprint("%s", conf_filename);
+ cprint("%s", filename);
stat = exec_conf();
switch(stat) {
case 0:
@@ -691,7 +693,7 @@ static void conf_save(void)
cprint(save_config_text);
cprint("11");
cprint("55");
- cprint("%s", conf_filename);
+ cprint("%s", filename);
stat = exec_conf();
switch(stat) {
case 0: