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

* include/grub/arc/arc.h: Account for missing "other" peripheral on

Browse source 
ARCS. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-30 17:40:31 +02:00
parent aa7bcb99df
commit 583e5b645c
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
grub-core/term/arc/console.c
View file

@ -61,7 +61,7 @@ grub_arc_is_device_serial (const char *name, int alt_names)
/*
Recognize:
serial(N)
serial(N)other(M)
serial(N)line(M)
*/
for (i = 0; i < 2; i++)
{
@ -84,11 +84,11 @@ grub_arc_is_device_serial (const char *name, int alt_names)
&& grub_memcmp (ptr + 1 - (sizeof ("serial") - 1),
"serial", sizeof ("serial") - 1) == 0)
return 1;
if (!(ptr + 1 >= name + sizeof ("other") - 1
&& grub_memcmp (ptr + 1 - (sizeof ("other") - 1),
"other", sizeof ("other") - 1) == 0))
if (!(ptr + 1 >= name + sizeof ("line") - 1
&& grub_memcmp (ptr + 1 - (sizeof ("line") - 1),
"line", sizeof ("line") - 1) == 0))
return 0;
ptr -= sizeof ("other") - 1;
ptr -= sizeof ("line") - 1;
if (alt_names)
{
if (*ptr != '/')