Commit 9952cfa5 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- revert r19825. Fix this in the kernel instead and read README.buildroot2

parent 0c1a521c

package/config/conf.c

+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void strip(char *str) 


	while ((isspace(*p)))

		p++;

	l = strlen((char *)p);

	l = strlen(p);

	if (p != str)

		memmove(str, p, l + 1);

	if (!l)
@@ -101,7 +101,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) 
		check_stdin();

	case ask_all:

		fflush(stdout);

		fgets((char *)line, 128, stdin);

		fgets(line, 128, stdin);

		return;

	case set_default:

		printf("%s\n", def);
@@ -194,8 +194,8 @@ int conf_string(struct menu *menu) 
				break;

			}

		default:

			line[strlen((char *)line)-1] = 0;

			def = (char *)line;

			line[strlen(line)-1] = 0;

			def = line;

		}

		if (def && sym_set_string_value(sym, def))

			return 0;
@@ -243,7 +243,7 @@ static int conf_sym(struct menu *menu) 
		case 'n':

		case 'N':

			newval = no;

			if (!line[1] || !strcmp((char *)&line[1], "o"))

			if (!line[1] || !strcmp(&line[1], "o"))

				break;

			continue;

		case 'm':
@@ -255,7 +255,7 @@ static int conf_sym(struct menu *menu) 
		case 'y':

		case 'Y':

			newval = yes;

			if (!line[1] || !strcmp((char *)&line[1], "es"))

			if (!line[1] || !strcmp(&line[1], "es"))

				break;

			continue;

		case 0:
@@ -356,7 +356,7 @@ static int conf_choice(struct menu *menu) 
			check_stdin();

		case ask_all:

			fflush(stdout);

			fgets((char *)line, 128, stdin);

			fgets(line, 128, stdin);

			strip(line);

			if (line[0] == '?') {

				printf("\n%s\n", menu->sym->help ?
@@ -366,7 +366,7 @@ static int conf_choice(struct menu *menu) 
			if (!line[0])

				cnt = def;

			else if (isdigit(line[0]))

				cnt = atoi((char *)line);

				cnt = atoi(line);

			else

				continue;

			break;
@@ -390,7 +390,7 @@ static int conf_choice(struct menu *menu) 
		}

		if (!child)

			continue;

		if (line[strlen((char *)line) - 1] == '?') {

		if (line[strlen(line) - 1] == '?') {

			printf("\n%s\n", child->sym->help ?

				child->sym->help : nohelp_text);

			continue;

package/config/confdata.c

+4 −4
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ static char *conf_expand_value(const char *in) 


	res_value[0] = 0;

	dst = name;

	while ((src = (signed char *) strchr((const char *)in, '$'))) {

		strncat(res_value, (char *)in, src - in);

	while ((src = strchr(in, '$'))) {

		strncat(res_value, in, src - in);

		src++;

		dst = name;

		while (isalnum(*src) || *src == '_')
@@ -63,7 +63,7 @@ static char *conf_expand_value(const char *in) 
		strcat(res_value, sym_get_string_value(sym));

		in = src;

	}

	strcat(res_value, (const char *)in);

	strcat(res_value, in);



	return res_value;

}
@@ -74,7 +74,7 @@ char *conf_get_default_confname(void) 
	static char fullname[PATH_MAX+1];

	char *env, *name;



	name = conf_expand_value((const signed char *)conf_defname);

	name = conf_expand_value(conf_defname);

	env = getenv(SRCTREE);

	if (env) {

		sprintf(fullname, "%s/%s", env, name);

package/config/lxdialog/inputbox.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width 
	if (!init)

		instr[0] = '\0';

	else

		strcpy((char *)instr, init);

		strcpy(instr, init);



do_resize:

	if (getmaxy(stdscr) <= (height - 2))
@@ -105,7 +105,7 @@ do_resize: 
		for (i = 0; i < box_width - 1; i++)

			waddch(dialog, instr[scroll + i]);

	} else {

		waddstr(dialog, (char *)instr);

		waddstr(dialog, instr);

	}



	wmove(dialog, box_y, box_x + input_x);
@@ -136,7 +136,7 @@ do_resize: 
							waddch(dialog,

							       instr[scroll + input_x + i] ?

							       instr[scroll + input_x + i] : ' ');

						input_x = strlen((char *)instr) - scroll;

						input_x = strlen(instr) - scroll;

					} else

						input_x--;

					instr[scroll + input_x] = '\0';

package/config/mconf.c

+4 −4
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ again: 
		return;

	}



	sym_arr = sym_re_search((char *)dialog_input_result);

	sym_arr = sym_re_search(dialog_input_result);

	res = get_relations_str(sym_arr);

	free(sym_arr);

	show_textbox(_("Search Results"), str_get(&res), 0, 0);
@@ -789,7 +789,7 @@ static void conf_string(struct menu *menu) 
				      sym_get_string_value(menu->sym));

		switch (res) {

		case 0:

			if (sym_set_string_value(menu->sym, (char *)dialog_input_result))

			if (sym_set_string_value(menu->sym, dialog_input_result))

				return;

			show_textbox(NULL, _("You have made an invalid entry."), 5, 43);

			break;
@@ -814,7 +814,7 @@ static void conf_load(void) 
		case 0:

			if (!dialog_input_result[0])

				return;

			if (!conf_read((char *)dialog_input_result))

			if (!conf_read(dialog_input_result))

				return;

			show_textbox(NULL, _("File does not exist!"), 5, 38);

			break;
@@ -838,7 +838,7 @@ static void conf_save(void) 
		case 0:

			if (!dialog_input_result[0])

				return;

			if (!conf_write((char *)dialog_input_result))

			if (!conf_write(dialog_input_result))

				return;

			show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);

			break;