projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: add support for the ADDBA extension element
[carl9170fw.git]
/
config
/
confdata.c
diff --git
a/config/confdata.c
b/config/confdata.c
index ab42aa650794e4f1a4bdc15ef65f23f404ad3b83..a124a25e899fde96872ff0a9952e079070339d44 100644
(file)
--- a/
config/confdata.c
+++ b/
config/confdata.c
@@
-894,6
+894,7
@@
int conf_write(const char *name)
const char *str;
char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
char *env;
const char *str;
char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
char *env;
+ int i;
bool need_newline = false;
if (!name)
bool need_newline = false;
if (!name)
@@
-941,7
+942,8
@@
int conf_write(const char *name)
"# %s\n"
"#\n", str);
need_newline = false;
"# %s\n"
"#\n", str);
need_newline = false;
- } else if (!(sym->flags & SYMBOL_CHOICE)) {
+ } else if (!(sym->flags & SYMBOL_CHOICE) &&
+ !(sym->flags & SYMBOL_WRITTEN)) {
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE))
goto next;
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE))
goto next;
@@
-949,7
+951,7
@@
int conf_write(const char *name)
fprintf(out, "\n");
need_newline = false;
}
fprintf(out, "\n");
need_newline = false;
}
- sym->flags
&= ~SYMBOL_WRITE
;
+ sym->flags
|= SYMBOL_WRITTEN
;
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
}
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
}
@@
-975,6
+977,9
@@
next:
}
fclose(out);
}
fclose(out);
+ for_all_symbols(i, sym)
+ sym->flags &= ~SYMBOL_WRITTEN;
+
if (*tmpname) {
if (is_same(name, tmpname)) {
conf_message("No change to %s", name);
if (*tmpname) {
if (is_same(name, tmpname)) {
conf_message("No change to %s", name);
@@
-1109,8
+1114,6
@@
int conf_write_autoconf(int overwrite)
if (!overwrite && is_present(autoconf_name))
return 0;
if (!overwrite && is_present(autoconf_name))
return 0;
- sym_clear_all_valid();
-
conf_write_dep("include/generated/auto.conf.cmd");
if (conf_touch_deps())
conf_write_dep("include/generated/auto.conf.cmd");
if (conf_touch_deps())