luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-1794-gio-tool-critical-glib-2-66' into 'glib-2-66'

Browse Source 
Backport !1794 “gio-tool-info: Prevent criticals if mount options are not available” to glib-2-66

See merge request GNOME/glib!1799
This commit is contained in:
Sebastian Dröge 2020-12-11 15:04:54 +00:00
commit 035975e7e6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gio-tool-info.c
View File

@ -182,7 +182,8 @@ show_info (GFile *file, GFileInfo *info)
gchar *root_string = NULL;
gchar *mount;
gchar *fs;
gchar *options;
const gchar *options;
gchar *options_string = NULL;
device = g_strescape (g_unix_mount_get_device_path (entry), NULL);
root = g_unix_mount_get_root_path (entry);
@ -194,16 +195,22 @@ show_info (GFile *file, GFileInfo *info)
}
mount = g_strescape (g_unix_mount_get_mount_path (entry), NULL);
fs = g_strescape (g_unix_mount_get_fs_type (entry), NULL);
options = g_strescape (g_unix_mount_get_options (entry), NULL);
options = g_unix_mount_get_options (entry);
if (options != NULL)
{
options_string = g_strescape (options, NULL);
}
g_print (_("unix mount: %s%s %s %s %s\n"), device,
root_string ? root_string : "", mount, fs, options);
root_string ? root_string : "", mount, fs,
options_string ? options_string : "");
g_free (device);
g_free (root_string);
g_free (mount);
g_free (fs);
g_free (options);
g_free (options_string);
g_unix_mount_free (entry);
}