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

Replace stpcpy with grub_stpcpy in tools.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-12 22:37:59 +02:00
parent bbdd6305db
commit ba44ca6d1a
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/getroot.c
View file

@ -667,14 +667,14 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
char *ptr;
*relroot = xmalloc (strlen (entries[i].enc_root) +
2 + strlen (dir));
ptr = stpcpy (*relroot, entries[i].enc_root);
ptr = grub_stpcpy (*relroot, entries[i].enc_root);
if (strlen (dir) > strlen (entries[i].enc_path))
{
while (ptr > *relroot && *(ptr - 1) == '/')
ptr--;
if (dir[strlen (entries[i].enc_path)] != '/')
*ptr++ = '/';
ptr = stpcpy (ptr, dir + strlen (entries[i].enc_path));
ptr = grub_stpcpy (ptr, dir + strlen (entries[i].enc_path));
}
*ptr = 0;
}