mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: inspect: Canonicalize paths for printing (RHBZ#859876).

Browse Source
This commit is contained in:
Richard W.M. Jones
2012-10-11 13:18:46 +00:00
parent c34dcf184e
commit f4a2aecd5f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fish/inspect.c
View File

@@ -179,7 +179,7 @@ void
print_inspect_prompt (void)
{
size_t i;
char *name;
char *name, *dev;
char **mountpoints;
name = guestfs_inspect_get_product_name (g, root);
@@ -195,8 +195,16 @@ print_inspect_prompt (void)
qsort (mountpoints, count_strings (mountpoints) / 2, 2 * sizeof (char *),
compare_keys);
for (i = 0; mountpoints[i] != NULL; i += 2)
printf (_("%s mounted on %s\n"), mountpoints[i+1], mountpoints[i]);
for (i = 0; mountpoints[i] != NULL; i += 2) {
/* Try to make the device name canonical for printing, but don't
* worry if this fails.
*/
dev = guestfs_canonical_device_name (g, mountpoints[i+1]);
if (!dev)
dev = mountpoints[i+1];
printf (_("%s mounted on %s\n"), dev, mountpoints[i]);
}
free_strings (mountpoints);
}