luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/oholy/trash-autofs' into 'master'

Browse Source 
gunixmounts: Return the last matching mount for same mount path

Closes #1727

See merge request GNOME/glib!740
This commit is contained in:
Philip Withnall 2019-04-03 12:23:10 +00:00
commit abde3efb34
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gunixmounts.c
View File

@ -1552,6 +1552,9 @@ g_unix_mounts_get (guint64 *time_read)
* is set, it will be filled with a unix timestamp for checking * is set, it will be filled with a unix timestamp for checking
* if the mounts have changed since with g_unix_mounts_changed_since(). * if the mounts have changed since with g_unix_mounts_changed_since().
* *
* If more mounts have the same mount path, the last matching mount
* is returned.
*
* Returns: (transfer full): a #GUnixMountEntry. * Returns: (transfer full): a #GUnixMountEntry.
**/ **/
GUnixMountEntry * GUnixMountEntry *
@ -1568,8 +1571,13 @@ g_unix_mount_at (const char *mount_path,
{ {
mount_entry = l->data; mount_entry = l->data;
if (!found && strcmp (mount_path, mount_entry->mount_path) == 0) if (strcmp (mount_path, mount_entry->mount_path) == 0)
found = mount_entry; {
if (found != NULL)
g_unix_mount_free (found);
found = mount_entry;
}
else else
g_unix_mount_free (mount_entry); g_unix_mount_free (mount_entry);
} }
@ -1587,6 +1595,9 @@ g_unix_mount_at (const char *mount_path,
* is set, it will be filled with a unix timestamp for checking * is set, it will be filled with a unix timestamp for checking
* if the mounts have changed since with g_unix_mounts_changed_since(). * if the mounts have changed since with g_unix_mounts_changed_since().
* *
* If more mounts have the same mount path, the last matching mount
* is returned.
*
* Returns: (transfer full): a #GUnixMountEntry. * Returns: (transfer full): a #GUnixMountEntry.
* *
* Since: 2.52 * Since: 2.52