vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-01-27 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
	of the line.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-27 17:47:36 +01:00
parent 989e1f934b
commit 63533ab093
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-27 Vladimir Serbinenko <phcoder@gmail.com>
* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
of the line.
2010-01-27 Vladimir Serbinenko <phcoder@gmail.com> 2010-01-27 Vladimir Serbinenko <phcoder@gmail.com>
* kern/disk.c (grub_disk_read): Fix offset computation when reading * kern/disk.c (grub_disk_read): Fix offset computation when reading

18
normal/cmdline.c
View file

@ -419,10 +419,13 @@ grub_cmdline_get (const char *prompt)
int restore; int restore;
char *insertu8; char *insertu8;
char *bufu8; char *bufu8;
grub_uint32_t c;
c = buf[lpos];
buf[lpos] = '\0'; buf[lpos] = '\0';
bufu8 = grub_ucs4_to_utf8_alloc (buf, lpos); bufu8 = grub_ucs4_to_utf8_alloc (buf, lpos);
buf[lpos] = c;
if (!bufu8) if (!bufu8)
{ {
grub_print_error (); grub_print_error ();
@ -462,8 +465,19 @@ grub_cmdline_get (const char *prompt)
insertlen, 0); insertlen, 0);
if (t > 0) if (t > 0)
{ {
insert[t] = 0; if (insert[t-1] == ' ' && buf[lpos] == ' ')
cl_insert (insert); {
insert[t-1] = 0;
if (t != 1)
cl_insert (insert);
lpos++;
cl_set_pos_all ();
}
else
{
insert[t] = 0;
cl_insert (insert);
}
} }
grub_free (insertu8); grub_free (insertu8);