Try shell in posix_spawn* only in compat mode

4 files changed, 52 insertions, 14 deletions

diff --git a/posix/spawn.c b/posix/spawn.c
index b93b320d02..dd68fbd554 100644
--- a/posix/spawn.c
+++ b/posix/spawn.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,31 @@
 
 #include <spawn.h>
 #include "spawn_int.h"
+#include <shlib-compat.h>
 
 /* Spawn a new process executing PATH with the attributes describes in *ATTRP.
    Before running the process perform the actions described in FILE-ACTIONS. */
 int
-posix_spawn (pid_t *pid, const char *path,
-	     const posix_spawn_file_actions_t *file_actions,
-	     const posix_spawnattr_t *attrp, char *const argv[],
-	     char *const envp[])
+__posix_spawn (pid_t *pid, const char *path,
+	       const posix_spawn_file_actions_t *file_actions,
+	       const posix_spawnattr_t *attrp, char *const argv[],
+	       char *const envp[])
 {
   return __spawni (pid, path, file_actions, attrp, argv, envp, 0);
 }
+versioned_symbol (libc, __posix_spawn, posix_spawn, GLIBC_2_15);
+
+
+#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
+int
+attribute_compat_text_section
+__posix_spawn_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_TRY_SHELL);
+}
+compat_symbol (libc, __posix_spawn_compat, posix_spawn, GLIBC_2_2);
+#endif
diff --git a/posix/spawn_int.h b/posix/spawn_int.h
index a3e934754f..5609e587e1 100644
--- a/posix/spawn_int.h
+++ b/posix/spawn_int.h
@@ -29,10 +29,13 @@ struct __spawn_action
   } action;
 };
 
+#define SPAWN_XFLAGS_USE_PATH	0x1
+#define SPAWN_XFLAGS_TRY_SHELL	0x2
+
 extern int __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *
 					       file_actions);
 
 extern int __spawni (pid_t *pid, const char *path,
 		     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);
diff --git a/posix/spawni.c b/posix/spawni.c
index c7d5f59ffc..4e5f77f264 100644
--- a/posix/spawni.c
+++ b/posix/spawni.c
@@ -1,5 +1,5 @@
 /* Guts of POSIX spawn interface.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 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
@@ -36,7 +36,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)
 {
   __set_errno (ENOSYS);
   return -1;
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