mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-03 14:56:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: Handle double slashes in $XDG_DATA_DIRS

Browse Source 
When checking for Flatpak directories in $XDG_DATA_DIRS, treat
/example//path/ as equivalent to /example/path/.

Fixes https://github.com/flatpak/flatpak/issues/2989

Closes: #2990
Approved by: alexlarsson

(cherry picked from commit 4fd7d7d209)

Closes: #2992
Approved by: alexlarsson
This commit is contained in:
Matthew Leeds
2019-06-27 15:04:21 -07:00
committed by Atomic Bot
parent 40de35049a
commit 3f8a68e40f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/flatpak-main.c
View File

@@ -254,9 +254,19 @@ check_environment (void)
dirs = g_get_system_data_dirs ();
for (i = 0; dirs[i]; i++)
{
if (g_str_has_prefix (dirs[i], system_exports))
/* There should never be a relative path but just in case we don't want
* g_file_new_for_path() to take the current directory into account.
*/
if (!g_str_has_prefix (dirs[i], "/"))
continue;
/* Normalize the path using GFile to e.g. replace // with / */
g_autoptr(GFile) dir_file = g_file_new_for_path (dirs[i]);
g_autofree char *dir_path = g_file_get_path (dir_file);
if (g_str_has_prefix (dir_path, system_exports))
has_system = TRUE;
if (g_str_has_prefix (dirs[i], user_exports))
if (g_str_has_prefix (dir_path, user_exports))
has_user = TRUE;
}