* kconfig (qconf): bug ?
@ 2002-11-09 13:44 Romain Lievin
2002-11-09 20:04 ` Roman Zippel
0 siblings, 1 reply; 2+ messages in thread
From: Romain Lievin @ 2002-11-09 13:44 UTC (permalink / raw)
To: Roman Zippel; +Cc: Linux Kernel
Hi Roman,
BTW, I noticed something weird with Qconf. I don't know whether it's a
bug or a mis-behaviour...
Once you have a .config file in /usr/src/linux and if you attempt to load
another config file, Qconf will not load my settings.
If you does not have the .config file yet (freshen install) and I attempt to
load my config file, Qconf will load it fine...
Well, how does conf_read() work ? What does it do exactly ?
Romain.
--
Romain Lievin, aka 'roms' <roms@lpg.ticalc.org>
Web site <http://lpg.ticalc.org/prj_tilp>
"Linux, y'a moins bien mais c'est plus cher !"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: kconfig (qconf): bug ?
2002-11-09 13:44 kconfig (qconf): bug ? Romain Lievin
@ 2002-11-09 20:04 ` Roman Zippel
0 siblings, 0 replies; 2+ messages in thread
From: Roman Zippel @ 2002-11-09 20:04 UTC (permalink / raw)
To: Romain Lievin; +Cc: Linux Kernel
Hi,
On Sat, 9 Nov 2002, Romain Lievin wrote:
> BTW, I noticed something weird with Qconf. I don't know whether it's a
> bug or a mis-behaviour...
>
> Once you have a .config file in /usr/src/linux and if you attempt to load
> another config file, Qconf will not load my settings.
> If you does not have the .config file yet (freshen install) and I attempt to
> load my config file, Qconf will load it fine...
The file was loaded, but the values were not immediately visible. The
symbol value is only calculated on demand and the flag wasn't cleared
(you had to change one value to see the update). The patch below fixes and
also forces a redisplay in qconf.
The patch also moves conf_filename to it's only user (mconf).
bye, Roman
diff -ur linux-2.5/scripts/kconfig/confdata.c linux-lkc/scripts/kconfig/confdata.c
--- linux-2.5/scripts/kconfig/confdata.c 2002-11-09 20:43:01.000000000 +0100
+++ linux-lkc/scripts/kconfig/confdata.c 2002-11-09 20:44:52.000000000 +0100
@@ -4,7 +4,6 @@
*/
#include <ctype.h>
-#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -14,7 +13,6 @@
#include "lkc.h"
const char conf_def_filename[] = ".config";
-char conf_filename[PATH_MAX+1];
const char conf_defname[] = "arch/$ARCH/defconfig";
@@ -71,8 +69,6 @@
if (name) {
in = fopen(name, "r");
- if (in)
- strcpy(conf_filename, name);
} else {
const char **names = conf_confnames;
while ((name = *names++)) {
@@ -91,21 +87,21 @@
return 1;
for_all_symbols(i, sym) {
- sym->flags |= SYMBOL_NEW;
+ sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED;
+ sym->flags &= ~SYMBOL_VALID;
switch (sym->type) {
case S_INT:
case S_HEX:
case S_STRING:
- if (S_VAL(sym->def)) {
+ if (S_VAL(sym->def))
free(S_VAL(sym->def));
- S_VAL(sym->def) = NULL;
- }
default:
- ;
+ S_VAL(sym->def) = NULL;
+ S_TRI(sym->def) = no;
}
}
- while (fgets(line, 128, in)) {
+ while (fgets(line, sizeof(line), in)) {
lineno++;
switch (line[0]) {
case '#':
@@ -357,7 +359,6 @@
rename(name, oldname);
if (rename(".tmpconfig", name))
return 1;
- strcpy(conf_filename, name);
sym_change_count = 0;
diff -ur linux-2.5/scripts/kconfig/mconf.c linux-lkc/scripts/kconfig/mconf.c
--- linux-2.5/scripts/kconfig/mconf.c 2002-11-09 20:43:01.000000000 +0100
+++ linux-lkc/scripts/kconfig/mconf.c 2002-11-09 20:44:53.000000000 +0100
@@ -11,6 +11,7 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <signal.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -82,6 +83,7 @@
static char buf[4096], *bufptr = buf;
static char input_buf[4096];
+static char filename[PATH_MAX+1] = ".config";
static char *args[1024], **argptr = args;
static int indent = 0;
static struct termios ios_org;
@@ -661,7 +663,7 @@
cprint(load_config_text);
cprint("11");
cprint("55");
- cprint("%s", conf_filename);
+ cprint("%s", filename);
stat = exec_conf();
switch(stat) {
case 0:
@@ -690,7 +692,7 @@
cprint(save_config_text);
cprint("11");
cprint("55");
- cprint("%s", conf_filename);
+ cprint("%s", filename);
stat = exec_conf();
switch(stat) {
case 0:
diff -ur linux-2.5/scripts/kconfig/qconf.cc linux-lkc/scripts/kconfig/qconf.cc
--- linux-2.5/scripts/kconfig/qconf.cc 2002-11-09 20:43:01.000000000 +0100
+++ linux-lkc/scripts/kconfig/qconf.cc 2002-11-09 20:44:53.000000000 +0100
@@ -890,6 +890,8 @@
return;
if (conf_read(s.latin1()))
QMessageBox::information(this, "qconf", "Unable to load configuration!");
+ configList->updateListAll();
+ menuList->updateListAll();
}
void ConfigView::saveConfig(void)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-11-09 19:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-11-09 13:44 kconfig (qconf): bug ? Romain Lievin
2002-11-09 20:04 ` Roman Zippel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®