2011-09-19 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/posix/spawni.c (script_execute): Always define it.
+ It will be optimized away if unused.
+ (maybe_script_execute): New function.
+ (__spawni): Call it.
+
* Makerules: Don't include tls.make.
(config-tls): Always set to thread.
* tls.make.c: File removed.
#define SPAWN_ERROR 127
-#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
/* The file is accessible but it is not an executable file. Invoke
the shell to interpret it as a script. */
static void
__execve (new_argv[0], new_argv, envp);
}
}
-# define tryshell (xflags & SPAWN_XFLAGS_TRY_SHELL)
-#else
-# define tryshell 0
-#endif
+static inline void
+maybe_script_execute (const char *file, char *const argv[], char *const envp[],
+ int xflags)
+{
+ if (SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
+ && (xflags & SPAWN_XFLAGS_TRY_SHELL)
+ && errno == ENOEXEC)
+ script_execute (file, argv, envp);
+}
/* Spawn a new process executing PATH with the attributes describes in *ATTRP.
Before running the process perform the actions described in FILE-ACTIONS. */
/* The FILE parameter is actually a path. */
__execve (file, argv, envp);
- if (tryshell && errno == ENOEXEC)
- script_execute (file, argv, envp);
+ maybe_script_execute (file, argv, envp, xflags);
/* Oh, oh. `execve' returns. This is bad. */
_exit (SPAWN_ERROR);
/* Try to execute this name. If it works, execv will not return. */
__execve (startp, argv, envp);
- if (tryshell && errno == ENOEXEC)
- script_execute (startp, argv, envp);
+ maybe_script_execute (startp, argv, envp, xflags);
switch (errno)
{