Synchronise with v4.5

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index a580f7bc057464608b18a1baa9dd9343c6de8766..70d457ee582999868ecc246463b460edbe20c711 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-4.4.0 afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc Blurry Fish Butt
+4.5.0 b562e44f507e863c6792946e4e1b1449fbbac85d Blurry Fish Butt
 0

diff --git a/frontends/conf/conf.c b/frontends/conf/conf.c
index 6c204318bc942dca084224ffa1b9c913b58b5e3a..866369f10ff84f4d2cae14eb6dfbe7e353c08adf 100644 (file)
--- a/frontends/conf/conf.c
+++ b/frontends/conf/conf.c
@@ -5,6 +5,7 @@
 
 #include <locale.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,7 +42,7 @@ static int tty_stdio;
 static int valid_stdin = 1;
 static int sync_kconfig;
 static int conf_cnt;
-static char line[128];
+static char line[PATH_MAX];
 static struct menu *rootEntry;
 
 static void print_help(struct menu *menu)
@@ -109,7 +110,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
                /* fall through */
        case oldaskconfig:
                fflush(stdout);
-               xfgets(line, 128, stdin);
+               xfgets(line, sizeof(line), stdin);
                if (!tty_stdio)
                        printf("\n");
                return 1;
@@ -311,7 +312,7 @@ static int conf_choice(struct menu *menu)
                        /* fall through */
                case oldaskconfig:
                        fflush(stdout);
-                       xfgets(line, 128, stdin);
+                       xfgets(line, sizeof(line), stdin);
                        strip(line);
                        if (line[0] == '?') {
                                print_help(menu);

diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
index 80da9ae35f9a07a5e8424764baeed35431b0a90b..19a84c9ed1b1fb8c6c0e117e0f49ee829d148e2a 100644 (file)
--- a/frontends/qconf/qconf.cc
+++ b/frontends/qconf/qconf.cc
@@ -1863,6 +1863,8 @@ int main(int ac, char** av)
 
        configSettings->endGroup();
        delete configSettings;
+       delete v;
+       delete configApp;
 
        return 0;
 }

diff --git a/libs/parser/menu.c b/libs/parser/menu.c
index b05cc3d4a9bea0fff7e4902e848372bb587be5cb..aed678e8a77750812bb9e49b7d9e7c6e32f9eea1 100644 (file)
--- a/libs/parser/menu.c
+++ b/libs/parser/menu.c
@@ -477,7 +477,7 @@ bool menu_is_visible(struct menu *menu)
 
        if (menu->visibility) {
                if (expr_calc_value(menu->visibility) == no)
-                       return no;
+                       return false;
        }
 
        sym = menu->sym;

diff --git a/scripts/ksync.log b/scripts/ksync.log
index e767fcc3eb08d79fea65dcef87048ef9b24466d9..27b5a7834430d765eb91fe7988a7078df22467e6 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -156,3 +156,6 @@ ed94fea kconfig/merge_config.sh: Support KCONFIG_CONFIG
 2163e7b kconfig/merge_config.sh: Accept a single file
 f6aad26 kconfig: Fix copy&paste error
 be596aa Add current selection check.
+74dba80 kconfig: allow kconfig to handle longer path names
+aab24a8 kconfig: return 'false' instead of 'no' in bool function
+5b61c7b kconfig: fix qconf segfault by deleting heap objects