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

Remove improper use of program_transform_name on pkglibrootdir.

Browse source 
* configure.ac (pkglibrootdir): Removed.
	(grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR.
	* util/grub-mkimage.c: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 10:35:37 +01:00
parent b4a6a53310
commit 8151bc82f7
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util/grub-mkimage.c
View file

@ -1663,7 +1663,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
switch (key)
{
case 'd':
return xasprintf (text, GRUB_PKGLIBROOTDIR);
return xasprintf (text, GRUB_PKGLIBDIR);
case 'p':
return xasprintf (text, DEFAULT_DIRECTORY);
case 'O':
@ -1861,13 +1861,13 @@ main (int argc, char *argv[])
if (!arguments.dir)
{
arguments.dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR)
arguments.dir = xmalloc (sizeof (GRUB_PKGLIBDIR)
+ grub_strlen (arguments.image_target->dirname)
+ 1);
memcpy (arguments.dir, GRUB_PKGLIBROOTDIR,
sizeof (GRUB_PKGLIBROOTDIR) - 1);
*(arguments.dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
strcpy (arguments.dir + sizeof (GRUB_PKGLIBROOTDIR),
memcpy (arguments.dir, GRUB_PKGLIBDIR,
sizeof (GRUB_PKGLIBDIR) - 1);
*(arguments.dir + sizeof (GRUB_PKGLIBDIR) - 1) = '/';
strcpy (arguments.dir + sizeof (GRUB_PKGLIBDIR),
arguments.image_target->dirname);
}