logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch (8740B)

    

  1. From 8e578ea68fa570aa46f04d4cf1c593ac11732bdf Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 17 Apr 2019 16:44:05 -0700
  4. Subject: [PATCH] libiberty: Implement pex_unix_exec_child using posix_spawn
  6. ---
  7.  libiberty/config.in    |  6 +++
  8.  libiberty/configure    | 10 ++---
  9.  libiberty/configure.ac | 10 ++---
  10.  libiberty/pex-unix.c   | 95 +++++++++++++++++++++++++++++++++++++++++-
  11.  4 files changed, 110 insertions(+), 11 deletions(-)
  13. diff --git a/libiberty/config.in b/libiberty/config.in
  14. index f7052b5d958..ce79a9e77f2 100644
  15. --- a/libiberty/config.in
  16. +++ b/libiberty/config.in
  17. @@ -198,6 +198,9 @@
  18.  /* Define to 1 if you have the `pipe2' function. */
  19.  #undef HAVE_PIPE2
  20.  
  21. +/* Define to 1 if you have the `posix_spawn' function. */
  22. +#undef HAVE_POSIX_SPAWN
  23. +
  24.  /* Define to 1 if you have the <process.h> header file. */
  25.  #undef HAVE_PROCESS_H
  26.  
  27. @@ -249,6 +252,9 @@
  28.  /* Define to 1 if you have the `spawnvpe' function. */
  29.  #undef HAVE_SPAWNVPE
  30.  
  31. +/* Define to 1 if you have the <spawn.h> header file. */
  32. +#undef HAVE_SPAWN_H
  33. +
  34.  /* Define to 1 if you have the <stdint.h> header file. */
  35.  #undef HAVE_STDINT_H
  36.  
  37. diff --git a/libiberty/configure b/libiberty/configure
  38. index 306c07bd37e..6f85b1fd529 100755
  39. --- a/libiberty/configure
  40. +++ b/libiberty/configure
  41. @@ -5652,7 +5652,7 @@ host_makefile_frag=${frag}
  42.  # It's OK to check for header files.  Although the compiler may not be
  43.  # able to link anything, it had better be able to at least compile
  44.  # something.
  45. -for ac_header in sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h
  46. +for ac_header in sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h spawn.h
  47.  do :
  48.    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  49.  ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
  50. @@ -6161,9 +6161,9 @@ funcs="$funcs setproctitle"
  51.  vars="sys_errlist sys_nerr sys_siglist"
  52.  
  53.  checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
  54. - getsysinfo gettimeofday on_exit pipe2 psignal pstat_getdynamic pstat_getstatic \
  55. - realpath setrlimit spawnve spawnvpe strerror strsignal sysconf sysctl \
  56. - sysmp table times wait3 wait4"
  57. + getsysinfo gettimeofday on_exit pipe2 posix_spawn psignal pstat_getdynamic \
  58. + pstat_getstatic realpath setrlimit spawnve spawnvpe strerror strsignal \
  59. + sysconf sysctl sysmp table times wait3 wait4"
  60.  
  61.  # Darwin has sbrk, but it is deprecated and that produces build-time warnings
  62.  # so do not check for it.
  63. @@ -6184,7 +6184,7 @@ if test "x" = "y"; then
  64.      index insque \
  65.      memchr memcmp memcpy memmem memmove memset mkstemps \
  66.      on_exit \
  67. -    pipe2 psignal pstat_getdynamic pstat_getstatic putenv \
  68. +    pipe2 posix_spawn psignal pstat_getdynamic pstat_getstatic putenv \
  69.      random realpath rename rindex \
  70.      sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
  71.       stpcpy stpncpy strcasecmp strchr strdup \
  72. diff --git a/libiberty/configure.ac b/libiberty/configure.ac
  73. index 6c1ff9c6093..5d21f383e7d 100644
  74. --- a/libiberty/configure.ac
  75. +++ b/libiberty/configure.ac
  76. @@ -289,7 +289,7 @@ AC_SUBST_FILE(host_makefile_frag)
  77.  # It's OK to check for header files.  Although the compiler may not be
  78.  # able to link anything, it had better be able to at least compile
  79.  # something.
  80. -AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h)
  81. +AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h spawn.h)
  82.  AC_HEADER_SYS_WAIT
  83.  AC_HEADER_TIME
  84.  
  85. @@ -412,9 +412,9 @@ funcs="$funcs setproctitle"
  86.  vars="sys_errlist sys_nerr sys_siglist"
  87.  
  88.  checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
  89. - getsysinfo gettimeofday on_exit pipe2 psignal pstat_getdynamic pstat_getstatic \
  90. - realpath setrlimit spawnve spawnvpe strerror strsignal sysconf sysctl \
  91. - sysmp table times wait3 wait4"
  92. + getsysinfo gettimeofday on_exit pipe2 posix_spawn psignal pstat_getdynamic \
  93. + pstat_getstatic realpath setrlimit spawnve spawnvpe strerror strsignal \
  94. + sysconf sysctl sysmp table times wait3 wait4"
  95.  
  96.  # Darwin has sbrk, but it is deprecated and that produces build-time warnings
  97.  # so do not check for it.
  98. @@ -435,7 +435,7 @@ if test "x" = "y"; then
  99.      index insque \
  100.      memchr memcmp memcpy memmem memmove memset mkstemps \
  101.      on_exit \
  102. -    pipe2 psignal pstat_getdynamic pstat_getstatic putenv \
  103. +    pipe2 posix_spawn psignal pstat_getdynamic pstat_getstatic putenv \
  104.      random realpath rename rindex \
  105.      sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
  106.       stpcpy stpncpy strcasecmp strchr strdup \
  107. diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c
  108. index 850d344ba58..ba3a6d5d38f 100644
  109. --- a/libiberty/pex-unix.c
  110. +++ b/libiberty/pex-unix.c
  111. @@ -58,6 +58,9 @@ extern int errno;
  112.  #ifdef HAVE_PROCESS_H
  113.  #include <process.h>
  114.  #endif
  115. +#ifdef HAVE_SPAWN_H
  116. +#include <spawn.h>
  117. +#endif
  118.  
  119.  #ifdef vfork /* Autoconf may define this to fork for us. */
  120.  # define VFORK_STRING "fork"
  121. @@ -366,7 +369,97 @@ pex_unix_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
  122.  
  123.  /* Execute a child.  */
  124.  
  125. -#if defined(HAVE_SPAWNVE) && defined(HAVE_SPAWNVPE)
  126. +#if defined(HAVE_POSIX_SPAWN)
  127. +/* Implementation of pex->exec_child using the posix_spawn operation.  */
  128. +
  129. +static pid_t
  130. +pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
  131. +		     char * const * argv, char * const * env,
  132. +                     int in, int out, int errdes,
  133. +		     int toclose, const char **errmsg, int *err)
  134. +{
  135. +  posix_spawn_file_actions_t file_actions;
  136. +  pid_t pid;
  137. +  int ret;
  138. +
  139. +  *errmsg = "posix_spawn";
  140. +  ret = posix_spawn_file_actions_init (&file_actions);
  141. +  if (ret != 0)
  142. +    goto error;
  143. +  if (in != STDIN_FILE_NO)
  144. +    {
  145. +      ret = posix_spawn_file_actions_adddup2 (&file_actions, in, STDIN_FILE_NO);
  146. +      if (ret != 0)
  147. +        goto error;
  148. +      ret = posix_spawn_file_actions_addclose (&file_actions, in);
  149. +      if (ret != 0)
  150. +        goto error;
  151. +    }
  152. +  if (out != STDOUT_FILE_NO)
  153. +    {
  154. +      ret = posix_spawn_file_actions_adddup2 (&file_actions, out, STDOUT_FILE_NO);
  155. +      if (ret != 0)
  156. +        goto error;
  157. +      ret = posix_spawn_file_actions_addclose (&file_actions, out);
  158. +      if (ret != 0)
  159. +        goto error;
  160. +    }
  161. +  if ((flags & PEX_STDERR_TO_STDOUT) != 0)
  162. +    {
  163. +      ret = posix_spawn_file_actions_adddup2 (&file_actions, STDOUT_FILE_NO, STDERR_FILE_NO);
  164. +      if (ret != 0)
  165. +        goto error;
  166. +    }
  167. +  else if (errdes != STDERR_FILE_NO)
  168. +    {
  169. +      ret = posix_spawn_file_actions_adddup2 (&file_actions, errdes, STDERR_FILE_NO);
  170. +      if (ret != 0)
  171. +        goto error;
  172. +      ret = posix_spawn_file_actions_addclose (&file_actions, errdes);
  173. +      if (ret != 0)
  174. +        goto error;
  175. +    }
  176. +  if (toclose >= 0)
  177. +    {
  178. +      ret = posix_spawn_file_actions_addclose (&file_actions, toclose);
  179. +      if (ret != 0)
  180. +        goto error;
  181. +    }
  182. +  if (env == NULL)
  183. +    env = environ;
  184. +  if ((flags & PEX_SEARCH) != 0)
  185. +    ret = posix_spawnp (&pid, executable, &file_actions, NULL, argv, env);
  186. +  else
  187. +    ret = posix_spawn (&pid, executable, &file_actions, NULL, argv, env);
  188. +  if (ret != 0)
  189. +    goto error;
  190. +  posix_spawn_file_actions_destroy(&file_actions);
  191. +
  192. +  *errmsg = "close";
  193. +  if (in != STDIN_FILE_NO && close (in) < 0)
  194. +    {
  195. +      ret = errno;
  196. +      goto error;
  197. +    }
  198. +  if (out != STDOUT_FILE_NO && close (out) < 0)
  199. +    {
  200. +      ret = errno;
  201. +      goto error;
  202. +    }
  203. +  if (errdes != STDERR_FILE_NO && close (errdes) < 0)
  204. +    {
  205. +      ret = errno;
  206. +      goto error;
  207. +    }
  208. +
  209. +  return pid;
  210. +
  211. + error:
  212. +  *err = ret;
  213. +  return (pid_t) -1;
  214. +}
  215. +
  216. +#elif defined(HAVE_SPAWNVE) && defined(HAVE_SPAWNVPE)
  217.  /* Implementation of pex->exec_child using the Cygwin spawn operation.  */
  218.  
  219.  /* Subroutine of pex_unix_exec_child.  Move OLD_FD to a new file descriptor
  220. -- 
  221. 2.35.1