Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
gspawn: Add GSpawnFlag to use the PATH from envp
Browse files Browse the repository at this point in the history 
Add a G_SPAWN_SEARCH_PATH_FROM_ENVP flag to GSpawnFlags so that
g_spawn_async() etc use the PATH variable from the passed-in child
environment to search for the executable.
If both this flag and the G_SPAWN_SEARCH_PATH flag are set, the
child environment is searched first and only falls back to the
PATH from the process environment if it is unset.

Bug #676398.
  • Loading branch information
Christian Persch committed May 22, 2012
1 parent 6969b63 commit 481191f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 13 deletions.
48 changes: 36 additions & 12 deletions glib/gspawn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
static gint g_execute (const gchar *file,
gchar **argv,
gchar **envp,
gboolean search_path);
gboolean search_path,
gboolean search_path_from_envp);

static gboolean make_pipe (gint p[2],
GError **error);
Expand All @@ -74,6 +75,7 @@ static gboolean fork_exec_with_pipes (gboolean intermediate_child,
gchar **envp,
gboolean close_descriptors,
gboolean search_path,
gboolean search_path_from_envp,
gboolean stdout_to_null,
gboolean stderr_to_null,
gboolean child_inherits_stdin,
Expand Down Expand Up @@ -288,6 +290,7 @@ g_spawn_sync (const gchar *working_directory,
envp,
!(flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN),
(flags & G_SPAWN_SEARCH_PATH) != 0,
(flags & G_SPAWN_SEARCH_PATH_FROM_ENVP) != 0,
(flags & G_SPAWN_STDOUT_TO_DEV_NULL) != 0,
(flags & G_SPAWN_STDERR_TO_DEV_NULL) != 0,
(flags & G_SPAWN_CHILD_INHERITS_STDIN) != 0,
Expand Down Expand Up @@ -480,8 +483,15 @@ g_spawn_sync (const gchar *working_directory,
* should be a %NULL-terminated array of strings, to be passed as the
* argument vector for the child. The first string in @argv is of
* course the name of the program to execute. By default, the name of
* the program must be a full path; the <envar>PATH</envar> shell variable
* will only be searched if you pass the %G_SPAWN_SEARCH_PATH flag.
* the program must be a full path. If @flags contains the
* %G_SPAWN_SEARCH_PATH flag, the <envar>PATH</envar> environment variable
* is used to search for the executable. If @flags contains the
* %G_SPAWN_SEARCH_PATH_FROM_ENVP flag, the <envar>PATH</envar> variable from
* @envp is used to search for the executable.
* If both the %G_SPAWN_SEARCH_PATH and %G_SPAWN_SEARCH_PATH_FROM_ENVP
* flags are set, the <envar>PATH</envar> variable from @envp takes precedence
* over the environment variable.
*
* If the program name is not a full path and %G_SPAWN_SEARCH_PATH flag is not
* used, then the program will be run from the current directory (or
* @working_directory, if specified); this might be unexpected or even
Expand Down Expand Up @@ -547,7 +557,11 @@ g_spawn_sync (const gchar *working_directory,
* descriptors except stdin/stdout/stderr will be closed before
* calling exec() in the child. %G_SPAWN_SEARCH_PATH
* means that <literal>argv[0]</literal> need not be an absolute path, it
* will be looked for in the user's <envar>PATH</envar>.
* will be looked for in the <envar>PATH</envar> environment variable.
* %G_SPAWN_SEARCH_PATH_FROM_ENVP means need not be an absolute path, it
* will be looked for in the <envar>PATH</envar> variable from @envp. If
* both %G_SPAWN_SEARCH_PATH and %G_SPAWN_SEARCH_PATH_FROM_ENVP are used,
* the value from @envp takes precedence over the environment.
* %G_SPAWN_STDOUT_TO_DEV_NULL means that the child's standard output will
* be discarded, instead of going to the same location as the parent's
* standard output. If you use this flag, @standard_output must be %NULL.
Expand Down Expand Up @@ -656,6 +670,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
envp,
!(flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN),
(flags & G_SPAWN_SEARCH_PATH) != 0,
(flags & G_SPAWN_SEARCH_PATH_FROM_ENVP) != 0,
(flags & G_SPAWN_STDOUT_TO_DEV_NULL) != 0,
(flags & G_SPAWN_STDERR_TO_DEV_NULL) != 0,
(flags & G_SPAWN_CHILD_INHERITS_STDIN) != 0,
Expand Down Expand Up @@ -1040,6 +1055,7 @@ do_exec (gint child_err_report_fd,
gchar **envp,
gboolean close_descriptors,
gboolean search_path,
gboolean search_path_from_envp,
gboolean stdout_to_null,
gboolean stderr_to_null,
gboolean child_inherits_stdin,
Expand Down Expand Up @@ -1131,7 +1147,7 @@ do_exec (gint child_err_report_fd,

g_execute (argv[0],
file_and_argv_zero ? argv + 1 : argv,
envp, search_path);
envp, search_path, search_path_from_envp);

/* Exec failed */
write_err_and_exit (child_err_report_fd,
Expand Down Expand Up @@ -1194,6 +1210,7 @@ fork_exec_with_pipes (gboolean intermediate_child,
gchar **envp,
gboolean close_descriptors,
gboolean search_path,
gboolean search_path_from_envp,
gboolean stdout_to_null,
gboolean stderr_to_null,
gboolean child_inherits_stdin,
Expand Down Expand Up @@ -1301,6 +1318,7 @@ fork_exec_with_pipes (gboolean intermediate_child,
envp,
close_descriptors,
search_path,
search_path_from_envp,
stdout_to_null,
stderr_to_null,
child_inherits_stdin,
Expand Down Expand Up @@ -1330,6 +1348,7 @@ fork_exec_with_pipes (gboolean intermediate_child,
envp,
close_descriptors,
search_path,
search_path_from_envp,
stdout_to_null,
stderr_to_null,
child_inherits_stdin,
Expand Down Expand Up @@ -1531,8 +1550,7 @@ make_pipe (gint p[2],
static void
script_execute (const gchar *file,
gchar **argv,
gchar **envp,
gboolean search_path)
gchar **envp)
{
/* Count the arguments. */
int argc = 0;
Expand Down Expand Up @@ -1577,7 +1595,8 @@ static gint
g_execute (const gchar *file,
gchar **argv,
gchar **envp,
gboolean search_path)
gboolean search_path,
gboolean search_path_from_envp)
{
if (*file == '\0')
{
Expand All @@ -1586,7 +1605,7 @@ g_execute (const gchar *file,
return -1;
}

if (!search_path || strchr (file, '/') != NULL)
if (!(search_path || search_path_from_envp) || strchr (file, '/') != NULL)
{
/* Don't search when it contains a slash. */
if (envp)
Expand All @@ -1595,7 +1614,7 @@ g_execute (const gchar *file,
execv (file, argv);

if (errno == ENOEXEC)
script_execute (file, argv, envp, FALSE);
script_execute (file, argv, envp);
}
else
{
Expand All @@ -1605,7 +1624,12 @@ g_execute (const gchar *file,
gsize len;
gsize pathlen;

path = g_getenv ("PATH");
path = NULL;
if (search_path_from_envp)
path = g_environ_getenv (envp, "PATH");
if (search_path && path == NULL)
path = g_getenv ("PATH");

if (path == NULL)
{
/* There is no `PATH' in the environment. The default
Expand Down Expand Up @@ -1654,7 +1678,7 @@ g_execute (const gchar *file,
execv (startp, argv);

if (errno == ENOEXEC)
script_execute (startp, argv, envp, search_path);
script_execute (startp, argv, envp);

switch (errno)
{
Expand Down
6 changes: 5 additions & 1 deletion glib/gspawn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
* vector to pass to the file. Normally g_spawn_async_with_pipes() uses
* <literal>argv[0]</literal> as the file to execute, and passes all of
* <literal>argv</literal> to the child.
* @G_SPAWN_SEARCH_PATH_FROM_ENVP: if <literal>argv[0]</literal> is not an abolute path,
* it will be looked for in the <envar>PATH</envar> from the passed child
* environment. Since: 2.34
*
* Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
*/
Expand All @@ -168,7 +171,8 @@ typedef enum
G_SPAWN_STDOUT_TO_DEV_NULL = 1 << 3,
G_SPAWN_STDERR_TO_DEV_NULL = 1 << 4,
G_SPAWN_CHILD_INHERITS_STDIN = 1 << 5,
G_SPAWN_FILE_AND_ARGV_ZERO = 1 << 6
G_SPAWN_FILE_AND_ARGV_ZERO = 1 << 6,
G_SPAWN_SEARCH_PATH_FROM_ENVP = 1 << 7,
} GSpawnFlags;

GQuark g_spawn_error_quark (void);
Expand Down

0 comments on commit 481191f

Please sign in to comment.