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

Merge branch 'fix-g_find_program_in_path' into 'main'

Browse Source 
gutils: Fix g_find_program_in_path() to return an absolute path

Closes #2586

See merge request GNOME/glib!2460
This commit is contained in:
Sebastian Dröge 2022-01-27 10:50:36 +00:00
commit 13ee46538f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gutils.c
View File

@ -456,7 +456,14 @@ g_find_program_in_path (const gchar *program)
!g_file_test (startp, G_FILE_TEST_IS_DIR)) !g_file_test (startp, G_FILE_TEST_IS_DIR))
{ {
gchar *ret; gchar *ret;
if (g_path_is_absolute (startp)) {
ret = g_strdup (startp); ret = g_strdup (startp);
} else {
gchar *cwd = NULL;
cwd = g_get_current_dir ();
ret = g_build_filename (cwd, startp, NULL);
g_free (cwd);
}
g_free (freeme); g_free (freeme);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_free ((gchar *) path_copy); g_free ((gchar *) path_copy);