public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Browse source 
Pull kconfig updates from Michal Marek:
 - Fix for make xconfig segfault
 - Handle long strings in config symbol values
 - Fix for mixing boolean and kconfig ternary type

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: fix qconf segfault by deleting heap objects
  kconfig: return 'false' instead of 'no' in bool function
  kconfig: allow kconfig to handle longer path names
This commit is contained in:
Linus Torvalds 2016-01-20 09:55:50 -08:00
commit af75d517a8
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/kconfig/conf.c
View file

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

2
scripts/kconfig/menu.c
View file

@ -477,7 +477,7 @@ bool menu_is_visible(struct menu *menu)
if (menu->visibility) { if (menu->visibility) {
if (expr_calc_value(menu->visibility) == no) if (expr_calc_value(menu->visibility) == no)
return no; return false;
} }
sym = menu->sym; sym = menu->sym;

2
scripts/kconfig/qconf.cc
View file

@ -1863,6 +1863,8 @@ int main(int ac, char** av)
configSettings->endGroup(); configSettings->endGroup();
delete configSettings; delete configSettings;
delete v;
delete configApp;
return 0; return 0;
} }