Messages in this thread Patch in this message | | | Date | Tue, 17 Aug 2010 10:45:13 +0800 | From | Li Zefan <> | Subject | Re: BUG: nconfig doesn't preserve case in its menu display |
| |
于 2010年08月17日 05:04, Ævar Arnfjörð Bjarmason 写道: > When I do "make nconfig" and go to "General Setup" my "Local version - > append to kernel release" entry appears as: > > (-avar-akbar) Local version - append to kernel release > > When I use "make menuconfig" it's: > > (-Avar-Akbar) Local version - append to kernel release > > And my .config agrees: > > $ ack -n1 CONFIG_LOCALVERSION .config > CONFIG_LOCALVERSION="-Avar-Akbar" > > But when I edit the version string in both menuconfig and nconfig it > retains the correct casing. > > I briefly searched through the nconfig code, but couldn't find > anything pertinent to the localversion, so this is probably a more > general issue.
The bug is in make_hot(). Here is the fix:
=======================
From: LiZefan <lizf@lizf.localdomain> Date: Tue, 17 Aug 2010 10:35:36 +0800 Subject: [PATCH] nconfig: remember where to start searcing hot key
make_hot() skips '[...]', '<...>' and '(...)', but forgets to remember where it starts to find the hot key, and then it makes all the letters before the hot key lower case.
As a result, it shows:
(-avar-akbar) Local version - append to kernel release ... <m> Kernel .config support
When it should be:
(-Avar-Akbar) Local version - append to kernel release ... <M> Kernel .config support
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- scripts/kconfig/nconf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 2ba71bc..ba5eade 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -522,6 +522,7 @@ static int is_hot(int index) static int make_hot(char *dest, int len, const char *org, int index) { int position = -1; + int start; int i; int tmp; int c; @@ -549,6 +550,7 @@ static int make_hot(char *dest, int len, const char *org, int index) } if (i == org_len) return -1; + start = ++i; for (; i < org_len; i++) { if (canbhot(org[i]) && org[i-1] != '<' && org[i-1] != '(') { position = i; @@ -569,7 +571,7 @@ static int make_hot(char *dest, int len, const char *org, int index) */ /* make org[position] uppercase, and all leading letter small case */ strncpy(dest, org, len); - for (i = 0; i < position; i++) + for (i = start; i < position; i++) dest[i] = tolower(dest[i]); dest[position] = toupper(dest[position]); k_menu_items[index].is_hot = 1; -- 1.6.3
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |