git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
scripts
/
kconfig
/
mconf.c
diff --git
a/scripts/kconfig/mconf.c
b/scripts/kconfig/mconf.c
index
e5db10c
..
7f97319
100644
(file)
--- a/
scripts/kconfig/mconf.c
+++ b/
scripts/kconfig/mconf.c
@@
-20,6
+20,7
@@
#include <string.h>
#include <termios.h>
#include <unistd.h>
#include <string.h>
#include <termios.h>
#include <unistd.h>
+#include <locale.h>
#define LKC_DIRECT_LINK
#include "lkc.h"
#define LKC_DIRECT_LINK
#include "lkc.h"
@@
-218,6
+219,7
@@
save_config_help[] = N_(
search_help[] = N_(
"\n"
"Search for CONFIG_ symbols and display their relations.\n"
search_help[] = N_(
"\n"
"Search for CONFIG_ symbols and display their relations.\n"
+ "Regular expressions are allowed.\n"
"Example: search for \"^FOO\"\n"
"Result:\n"
"-----------------------------------------------------------------\n"
"Example: search for \"^FOO\"\n"
"Result:\n"
"-----------------------------------------------------------------\n"
@@
-254,8
+256,8
@@
search_help[] = N_(
" USB$ => find all CONFIG_ symbols ending with USB\n"
"\n");
" USB$ => find all CONFIG_ symbols ending with USB\n"
"\n");
-static
signed
char buf[4096], *bufptr = buf;
-static
signed
char input_buf[4096];
+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;
static char filename[PATH_MAX+1] = ".config";
static char *args[1024], **argptr = args;
static int indent;
@@
-323,7
+325,7
@@
static void cprint_init(void)
memset(args, 0, sizeof(args));
indent = 0;
child_count = 0;
memset(args, 0, sizeof(args));
indent = 0;
child_count = 0;
- cprint("./scripts/lxdialog/lxdialog");
+ cprint("./scripts/
kconfig/
lxdialog/lxdialog");
cprint("--backtitle");
cprint(menu_backtitle);
}
cprint("--backtitle");
cprint(menu_backtitle);
}
@@
-530,7
+532,7
@@
again:
cprint("--title");
cprint(_("Search Configuration Parameter"));
cprint("--inputbox");
cprint("--title");
cprint(_("Search Configuration Parameter"));
cprint("--inputbox");
- cprint(_("Enter
Keyword
"));
+ cprint(_("Enter
CONFIG_ (sub)string to search for (omit CONFIG_)
"));
cprint("10");
cprint("75");
cprint("");
cprint("10");
cprint("75");
cprint("");
@@
-1049,7
+1051,7
@@
int main(int ac, char **av)
conf_parse(av[1]);
conf_read(NULL);
conf_parse(av[1]);
conf_read(NULL);
- sym = sym_lookup("KERNEL
RELEASE
", 0);
+ sym = sym_lookup("KERNEL
VERSION
", 0);
sym_calc_value(sym);
sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
sym_get_string_value(sym));
sym_calc_value(sym);
sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
sym_get_string_value(sym));