From 6a1be2701196d69f20806067cee93a2d81d7229f Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 25 Jun 2006 20:06:59 +0000 Subject: [PATCH] add 'reset to defaults' to menuconfig git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4080 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/config/confdata.c | 23 +++++++++++++++++++++++ scripts/config/lkc_proto.h | 1 + scripts/config/mconf.c | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c index a1abdeb08..641aa4891 100644 --- a/scripts/config/confdata.c +++ b/scripts/config/confdata.c @@ -83,6 +83,29 @@ char *conf_get_default_confname(void) return name; } +void conf_reset(void) +{ + struct symbol *sym; + int i; + + for_all_symbols(i, sym) { + sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED; + if (sym_is_choice(sym)) + sym->flags &= ~SYMBOL_NEW; + sym->flags &= ~SYMBOL_VALID; + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + if (sym->user.val) + free(sym->user.val); + default: + sym->user.val = NULL; + sym->user.tri = no; + } + } +} + int conf_read_simple(const char *name) { FILE *in = NULL; diff --git a/scripts/config/lkc_proto.h b/scripts/config/lkc_proto.h index b6a389c5f..15fafd01b 100644 --- a/scripts/config/lkc_proto.h +++ b/scripts/config/lkc_proto.h @@ -2,6 +2,7 @@ /* confdata.c */ P(conf_parse,void,(const char *name)); P(conf_read,int,(const char *name)); +P(conf_reset,void,(void)); P(conf_read_simple,int,(const char *name)); P(conf_write,int,(const char *name)); diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c index 2ef24aa5b..5caf82280 100644 --- a/scripts/config/mconf.c +++ b/scripts/config/mconf.c @@ -737,6 +737,8 @@ static void conf(struct menu *menu) if (menu == &rootmenu) { cprint(":"); cprint("--- "); + cprint("D"); + cprint(_(" Reset to defaults")); cprint("L"); cprint(_(" Load an Alternate Configuration File")); cprint("S"); @@ -783,6 +785,9 @@ static void conf(struct menu *menu) case 's': conf_string(submenu); break; + case 'D': + conf_reset(); + break; case 'L': conf_load(); break; -- 2.20.1