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

Inline printf templates when possible to enable format checking.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-21 13:40:18 +01:00
parent d88ae4f0a4
commit 5dbde526a8
4 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
grub-core/osdep/unix/getroot.c
View file

@ -443,17 +443,18 @@ grub_find_device (const char *dir, dev_t dev)
/* Found! */
char *res;
char *cwd;
#if defined(__NetBSD__) || defined(__OpenBSD__)
/* Convert this block device to its character (raw) device. */
const char *template = "%s/r%s";
#else
/* Keep the device name as it is. */
const char *template = "%s/%s";
#endif
cwd = xgetcwd ();
res = xmalloc (strlen (cwd) + strlen (ent->d_name) + 3);
sprintf (res, template, cwd, ent->d_name);
sprintf (res,
#if defined(__NetBSD__) || defined(__OpenBSD__)
/* Convert this block device to its character (raw) device. */
"%s/r%s",
#else
/* Keep the device name as it is. */
"%s/%s",
#endif
cwd, ent->d_name);
strip_extra_slashes (res);
free (cwd);