aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/config/mconf.c
diff options
context:
space:
mode:
authorEneas U de Queiroz <cotequeiroz@gmail.com>2021-11-24 18:25:43 -0300
committerPetr Štetiar <ynezz@true.cz>2022-02-19 13:10:01 +0100
commit009293c52e637612cd118717a1bea4e142889e09 (patch)
treec9f190a622ce0a6335875c561af5cdc2918b53ff /scripts/config/mconf.c
parent73ea763c0dcdb96c9163790f20edd964399035c0 (diff)
downloadupstream-009293c52e637612cd118717a1bea4e142889e09.tar.gz
upstream-009293c52e637612cd118717a1bea4e142889e09.tar.bz2
upstream-009293c52e637612cd118717a1bea4e142889e09.zip
build: scripts/config - update to kconfig-v5.14
Functional Changes ---------- ------- - make 'imply' not impose any restrictions: allow symbols implied by y to become m - change "modules" from sub-option to first-level attribute Bugfixes -------- - nconf: fix core dump when searching in empty menu - nconf: stop endless search loops - xconfig: fix content of the main widget - xconfig: fix support for the split view mode Other Changes ----- ------- - highlight xconfig 'comment' lines with '***' - xconfig: navigate menus on hyperlinks - xconfig: drop support for Qt4 - improve host ncurses detection Update the 'option modules' usage to just 'modules' in Config.in. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'scripts/config/mconf.c')
-rw-r--r--scripts/config/mconf.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 69eb3083c7..81d232b665 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -22,6 +22,8 @@
#include "lkc.h"
#include "lxdialog/dialog.h"
+#define JUMP_NB 9
+
static const char mconf_readme[] =
"OpenWrt config is based on Kernel kconfig\n"
"so ipkg packages are referred here as modules.\n"
@@ -300,17 +302,12 @@ static char filename[PATH_MAX+1];
static void set_config_filename(const char *config_filename)
{
static char menu_backtitle[PATH_MAX+128];
- int size;
- size = snprintf(menu_backtitle, sizeof(menu_backtitle),
- "%s - %s", config_filename, rootmenu.prompt->text);
- if (size >= sizeof(menu_backtitle))
- menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+ snprintf(menu_backtitle, sizeof(menu_backtitle), "%s - %s",
+ config_filename, rootmenu.prompt->text);
set_dialog_backtitle(menu_backtitle);
- size = snprintf(filename, sizeof(filename), "%s", config_filename);
- if (size >= sizeof(filename))
- filename[sizeof(filename)-1] = '\0';
+ snprintf(filename, sizeof(filename), "%s", config_filename);
}
struct subtitle_part {
@@ -921,7 +918,7 @@ static void conf_load(void)
return;
if (!conf_read(dialog_input_result)) {
set_config_filename(dialog_input_result);
- sym_set_change_count(1);
+ conf_set_changed(true);
return;
}
show_textbox(NULL, "File does not exist!", 5, 38);