From d96de9634a334af16c0ac711074c15ac1762b23c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 5 Sep 2011 20:24:50 -0400 Subject: Try shell in posix_spawn* only in compat mode --- posix/spawnp.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'posix/spawnp.c') diff --git a/posix/spawnp.c b/posix/spawnp.c index 2b15391..79886fb 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 #include "spawn_int.h" +#include /* 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 -- cgit v1.1