* grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly
delimit path in strings using quotes. * util/getroot.c (grub_guess_root_devices): Likewise. (grub_make_system_path_relative_to_its_root): Likewise. * util/grub-probe.c (probe): Likewise. * util/ieee1275/ofpath.c (find_obppath): Likewise. (xrealpath): Likewise.
This commit is contained in:
parent
4a9950ecb0
commit
22099030ad
5 changed files with 16 additions and 6 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2013-01-13 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly
|
||||
delimit path in strings using quotes.
|
||||
* util/getroot.c (grub_guess_root_devices): Likewise.
|
||||
(grub_make_system_path_relative_to_its_root): Likewise.
|
||||
* util/grub-probe.c (probe): Likewise.
|
||||
* util/ieee1275/ofpath.c (find_obppath): Likewise.
|
||||
(xrealpath): Likewise.
|
||||
|
||||
2013-01-13 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
Fix compilation with older compilers.
|
||||
|
|
|
@ -1339,7 +1339,7 @@ read_device_map (const char *dev_map)
|
|||
{
|
||||
map[drive].device = xmalloc (PATH_MAX);
|
||||
if (! realpath (p, map[drive].device))
|
||||
grub_util_error (_("failed to get canonical path of %s"), p);
|
||||
grub_util_error (_("failed to get canonical path of `%s'"), p);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
|
|
|
@ -1065,7 +1065,7 @@ grub_guess_root_devices (const char *dir)
|
|||
{
|
||||
*cur = canonicalize_file_name (tmp);
|
||||
if (*cur == NULL)
|
||||
grub_util_error (_("failed to get canonical path of %s"), tmp);
|
||||
grub_util_error (_("failed to get canonical path of `%s'"), tmp);
|
||||
free (tmp);
|
||||
}
|
||||
root = (strcmp (*cur, "/dev/root") == 0);
|
||||
|
@ -2778,7 +2778,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
|
|||
/* canonicalize. */
|
||||
p = canonicalize_file_name (path);
|
||||
if (p == NULL)
|
||||
grub_util_error (_("failed to get canonical path of %s"), path);
|
||||
grub_util_error (_("failed to get canonical path of `%s'"), path);
|
||||
|
||||
/* For ZFS sub-pool filesystems, could be extended to others (btrfs?). */
|
||||
#if !defined (__MINGW32__) && !defined (__CYGWIN__)
|
||||
|
|
|
@ -327,7 +327,7 @@ probe (const char *path, char **device_names, char delim)
|
|||
{
|
||||
grub_path = canonicalize_file_name (path);
|
||||
if (! grub_path)
|
||||
grub_util_error (_("failed to get canonical path of %s"), path);
|
||||
grub_util_error (_("failed to get canonical path of `%s'"), path);
|
||||
device_names = grub_guess_root_devices (grub_path);
|
||||
free (grub_path);
|
||||
}
|
||||
|
|
|
@ -131,7 +131,7 @@ find_obppath (const char *sysfs_path_orig)
|
|||
kill_trailing_dir(sysfs_path);
|
||||
if (!strcmp(sysfs_path, "/sys"))
|
||||
{
|
||||
grub_util_info (_("'obppath' not found in parent dirs of %s,"
|
||||
grub_util_info (_("`obppath' not found in parent dirs of `%s',"
|
||||
" no IEEE1275 name discovery"),
|
||||
sysfs_path_orig);
|
||||
free (path);
|
||||
|
@ -164,7 +164,7 @@ xrealpath (const char *in)
|
|||
out = realpath (in, NULL);
|
||||
#endif
|
||||
if (!out)
|
||||
grub_util_error (_("failed to get canonical path of %s"), in);
|
||||
grub_util_error (_("failed to get canonical path of `%s'"), in);
|
||||
return out;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue