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

Fix kfreebsd compile and behaviour.

Browse source 
* grub-core/kern/emu/hostdisk.c (grub_util_follow_gpart_up): Fix
	format-security.
	* util/getroot.c: Fix wait.h include.
	(grub_guess_root_devices): Error if grub_find_device fails.
	(grub_util_get_geom_abstraction): Fix shadowing and format-security.
	(grub_util_get_dev_abstraction): Likewise.
	(grub_util_pull_device): Likewise.
	(grub_util_get_grub_dev): Likewise.
	* util/lvm.c (grub_util_lvm_isvolume): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-21 16:49:56 +02:00
parent 48143d96a6
commit 9a06490c07
4 changed files with 55 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util/lvm.c
View file

@ -28,17 +28,17 @@
int
grub_util_lvm_isvolume (char *name)
{
char *devname;
char *lvmdevname;
struct stat st;
int err;
devname = xmalloc (strlen (name) + sizeof (LVM_DEV_MAPPER_STRING));
lvmdevname = xmalloc (strlen (name) + sizeof (LVM_DEV_MAPPER_STRING));
strcpy (devname, LVM_DEV_MAPPER_STRING);
strcpy (devname + sizeof(LVM_DEV_MAPPER_STRING) - 1, name);
strcpy (lvmdevname, LVM_DEV_MAPPER_STRING);
strcpy (lvmdevname + sizeof(LVM_DEV_MAPPER_STRING) - 1, name);
err = stat (devname, &st);
free (devname);
err = stat (lvmdevname, &st);
free (lvmdevname);
if (err)
return 0;