Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af75d517 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents d9569f00 5b61c7bd

scripts/kconfig/conf.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

scripts/kconfig/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

scripts/kconfig/qconf.cc

+2 −0
Original line number Diff line number Diff line
@@ -1863,6 +1863,8 @@ int main(int ac, char** av) 


	configSettings->endGroup();

	delete configSettings;

	delete v;

	delete configApp;



	return 0;

}