diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-04-15 16:45:11 +0000 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-04-15 16:45:11 +0000 |
| commit | afaffaea3892b0d2af9269e10a2d9e09a95174f2 (patch) | |
| tree | 064c98815470434478c33fc486220b8c8357d368 /kconfig/mconf.c | |
| parent | 5fbbd29ee62ba971d4660a409d3d763c2617eae9 (diff) | |
| download | crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.tar.gz crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.tar.bz2 crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.zip | |
Update to latest kconfig from linux-2.6.20.7.
I'm not sure of the improvements, but at least we're up-to-date, and updating in the future will be easier.
Diffstat (limited to 'kconfig/mconf.c')
| -rw-r--r-- | kconfig/mconf.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/kconfig/mconf.c b/kconfig/mconf.c index 8f268bec..69fc4d54 100644 --- a/kconfig/mconf.c +++ b/kconfig/mconf.c @@ -868,7 +868,7 @@ int main(int ac, char **av) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - conf_parse(av[1] ? av[1] : ""); + conf_parse(av[1]); conf_read(NULL); sym = sym_lookup("PROJECTVERSION", 0); @@ -890,26 +890,33 @@ int main(int ac, char **av) do { conf(&rootmenu); dialog_clear(); - res = dialog_yesno(NULL, - _("Do you wish to save your " - "new "PROJECT_NAME" configuration?\n" - "<ESC><ESC> to continue."), - 6, 60); + if (conf_get_changed()) + res = dialog_yesno(NULL, + _("Do you wish to save your " + "new "PROJECT_NAME" configuration?\n" + "<ESC><ESC> to continue."), + 6, 60); + else + res = -1; } while (res == KEY_ESC); end_dialog(); - if (res == 0) { + + switch (res) { + case 0: if (conf_write(NULL)) { fprintf(stderr, _("\n\n" - "Error writing "PROJECT_NAME" configuration.\n" - "Your configuration changes were NOT saved." + "Error during writing of "PROJECT_NAME" configuration.\n" + "Your kernel configuration changes were NOT saved." "\n\n")); return 1; } + case -1: printf(_("\n\n" "*** End of "PROJECT_NAME" configuration.\n" - "*** Execute 'make' to build, or try 'make help'." + "*** Execute 'make' to build the kernel or try 'make help'." "\n\n")); - } else { + break; + default: fprintf(stderr, _("\n\n" "Your configuration changes were NOT saved." "\n\n")); |