about summary refs log tree commit diff
path: root/posix/spawnp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-05 20:24:50 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-05 20:24:50 -0400
commitd96de9634a334af16c0ac711074c15ac1762b23c (patch)
tree78f566d420a800c92347a7b994d8850a644f1b61 /posix/spawnp.c
parent54b1f8b6bf88e34c55b77b2e4acb00776b4a5783 (diff)
downloadglibc-d96de9634a334af16c0ac711074c15ac1762b23c.tar.gz
glibc-d96de9634a334af16c0ac711074c15ac1762b23c.tar.xz
glibc-d96de9634a334af16c0ac711074c15ac1762b23c.zip
Try shell in posix_spawn* only in compat mode
Diffstat (limited to 'posix/spawnp.c')
-rw-r--r--posix/spawnp.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/posix/spawnp.c b/posix/spawnp.c
index 2b15391beb..79886fb788 100644
--- a/posix/spawnp.c
+++ b/posix/spawnp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2011 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
@@ -18,14 +18,32 @@
 
 #include <spawn.h>
 #include "spawn_int.h"
+#include <shlib-compat.h>
 
 /* Spawn a new process executing FILE with the attributes describes in *ATTRP.
    Before running the process perform the actions described in FILE-ACTIONS. */
 int
-posix_spawnp (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[])
+__posix_spawnp (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[])
 {
-  return __spawni (pid, file, file_actions, attrp, argv, envp, 1);
+  return __spawni (pid, file, file_actions, attrp, argv, envp,
+		   SPAWN_XFLAGS_USE_PATH);
 }
+versioned_symbol (libc, __posix_spawnp, posix_spawnp, GLIBC_2_15);
+
+
+#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
+int
+attribute_compat_text_section
+__posix_spawnp_compat (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[])
+{
+  return __spawni (pid, file, file_actions, attrp, argv, envp,
+		   SPAWN_XFLAGS_USE_PATH | SPAWN_XFLAGS_TRY_SHELL);
+}
+compat_symbol (libc, __posix_spawnp_compat, posix_spawnp, GLIBC_2_2);
+#endif