diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/spawni.c | 10 | ||||
| -rw-r--r-- | sysdeps/posix/spawni.c | 14 |
2 files changed, 15 insertions, 9 deletions
diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c index 244ca2d..3d2b591 100644 --- a/sysdeps/mach/hurd/spawni.c +++ b/sysdeps/mach/hurd/spawni.c @@ -1,5 +1,5 @@ /* spawn a new process running an executable. Hurd version. - Copyright (C) 2001,02,04 Free Software Foundation, Inc. + Copyright (C) 2001,02,04,11 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -41,7 +41,7 @@ __spawni (pid_t *pid, const char *file, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *attrp, char *const argv[], char *const envp[], - int use_path) + int xflags) { pid_t new_pid; char *path, *p, *name; @@ -391,7 +391,7 @@ __spawni (pid_t *pid, const char *file, /* Make sure the dtable can hold NEWFD. */ #define EXPAND_DTABLE(newfd) \ - ({ \ + ({ \ if ((unsigned int)newfd >= dtablesize \ && newfd < _hurd_rlimits[RLIMIT_OFILE].rlim_cur) \ { \ @@ -399,7 +399,7 @@ __spawni (pid_t *pid, const char *file, NEW_TABLE (dtable, newfd); \ NEW_TABLE (ulink_dtable, newfd); \ NEW_TABLE (dtable_cells, newfd); \ - dtablesize = newfd + 1; \ + dtablesize = newfd + 1; \ } \ ((unsigned int)newfd < dtablesize ? 0 : EMFILE); \ }) @@ -543,7 +543,7 @@ __spawni (pid_t *pid, const char *file, conditions are diagnosed first and what side effects (file creation, etc) can be observed before what errors. */ - if (! use_path || strchr (file, '/') != NULL) + if ((xflags & SPAWN_XFLAGS_USE_PATH) == 0 || strchr (file, '/') != NULL) /* The FILE parameter is actually a path. */ err = child_lookup (file, O_EXEC, 0, &execfile); else diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c index f19862f..129edcd 100644 --- a/sysdeps/posix/spawni.c +++ b/sysdeps/posix/spawni.c @@ -28,6 +28,7 @@ #include "spawn_int.h" #include <not-cancel.h> #include <local-setxid.h> +#include <shlib-compat.h> /* The Unix standard contains a long explanation of the way to signal @@ -38,6 +39,7 @@ #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 @@ -64,6 +66,10 @@ script_execute (const char *file, char *const argv[], char *const envp[]) __execve (new_argv[0], new_argv, envp); } } +# define tryshell (xflags & SPAWN_XFLAGS_TRY_SHELL) +#else +# define tryshell 0 +#endif /* Spawn a new process executing PATH with the attributes describes in *ATTRP. @@ -72,7 +78,7 @@ int __spawni (pid_t *pid, const char *file, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *attrp, char *const argv[], - char *const envp[], int use_path) + char *const envp[], int xflags) { pid_t new_pid; char *path, *p, *name; @@ -226,12 +232,12 @@ __spawni (pid_t *pid, const char *file, } } - if (! use_path || strchr (file, '/') != NULL) + if ((xflags & SPAWN_XFLAGS_USE_PATH) == 0 || strchr (file, '/') != NULL) { /* The FILE parameter is actually a path. */ __execve (file, argv, envp); - if (errno == ENOEXEC) + if (tryshell && errno == ENOEXEC) script_execute (file, argv, envp); /* Oh, oh. `execve' returns. This is bad. */ @@ -277,7 +283,7 @@ __spawni (pid_t *pid, const char *file, /* Try to execute this name. If it works, execv will not return. */ __execve (startp, argv, envp); - if (errno == ENOEXEC) + if (tryshell && errno == ENOEXEC) script_execute (startp, argv, envp); switch (errno) |