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

* util/getroot.c [__APPLE__]: Add missing includes.

Browse source 
(grub_util_biosdisk_is_floppy): Fix usage of undefined variable.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 14:14:08 +01:00
parent 3cb38f015f
commit 434814814b
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c [__APPLE__]: Add missing includes.
(grub_util_biosdisk_is_floppy): Fix usage of undefined variable.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (generate_image): Silence spurious warning. * util/grub-mkimage.c (generate_image): Silence spurious warning.

11
util/getroot.c
View file

@ -114,6 +114,9 @@
#if defined(__APPLE__) #if defined(__APPLE__)
# include <sys/disk.h> # include <sys/disk.h>
# include <sys/param.h>
# include <sys/sysctl.h>
# include <sys/mount.h>
#endif #endif
#ifdef HAVE_DEVICE_MAPPER #ifdef HAVE_DEVICE_MAPPER
@ -1523,10 +1526,10 @@ grub_util_biosdisk_is_floppy (grub_disk_t disk)
#else #else
/* Some kernels (e.g. kFreeBSD) don't have a static major number /* Some kernels (e.g. kFreeBSD) don't have a static major number
for floppies, but they still use a "fd[0-9]" pathname. */ for floppies, but they still use a "fd[0-9]" pathname. */
if (map[disk->id].device[5] == 'f' if (dname[5] == 'f'
&& map[disk->id].device[6] == 'd' && dname[6] == 'd'
&& map[disk->id].device[7] >= '0' && dname[7] >= '0'
&& map[disk->id].device[7] <= '9') && dname[7] <= '9')
#endif #endif
return 1; return 1;