drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* libc/posix/posix_spawn.c: Eliminate OS function calls not present 

in newlib or Cygwin.
	(process_spawnattr): Use sigprocmask rather than _sigprocmask.  Use
	sigaction rather than _sigaction.
	(process_file_actions_entry): Use dup2 rather than _dup2.
	(do_posix_spawn): Use execvpe rather than _execvpe.  Use waitpid
	rather than _waitpid.
This commit is contained in:
Corinna Vinschen 2013-11-26 13:48:00 +00:00
parent d264970f79
commit 6fe752f94f
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newlib/ChangeLog
View File

@ -1,3 +1,13 @@
2013-11-26 Corinna Vinschen <vinschen@redhat.com>
* libc/posix/posix_spawn.c: Eliminate OS function calls not present
in newlib or Cygwin.
(process_spawnattr): Use sigprocmask rather than _sigprocmask. Use
sigaction rather than _sigaction.
(process_file_actions_entry): Use dup2 rather than _dup2.
(do_posix_spawn): Use execvpe rather than _execvpe. Use waitpid
rather than _waitpid.
2013-11-25 Joel Sherrill <joel.sherrill@oarcorp.com> 2013-11-25 Joel Sherrill <joel.sherrill@oarcorp.com>
* libc/iconv/lib/iconv.c, libc/time/strftime.c: Change "restrict<" to * libc/iconv/lib/iconv.c, libc/time/strftime.c: Change "restrict<" to

18
newlib/libc/posix/posix_spawn.c
View File

@ -80,9 +80,9 @@ argument is unspecified.
PORTABILITY PORTABILITY
POSIX.1-2008 requires <<posix_spawn>> and <<posix_spawnp>>. POSIX.1-2008 requires <<posix_spawn>> and <<posix_spawnp>>.
Supporting OS subroutines required: <<_close>>, <<_dup2>>, <<_fcntl>>, Supporting OS subroutines required: <<_close>>, <<dup2>>, <<_fcntl>>,
<<_execve>>, <<_execvpe>>, <<_exit>>, <<_open>>, <<_sigaction>>, <<_execve>>, <<execvpe>>, <<_exit>>, <<_open>>, <<sigaction>>,
<<_sigprocmask>>, <<_waitpid>>, <<sched_setscheduler>>, <<sigprocmask>>, <<waitpid>>, <<sched_setscheduler>>,
<<sched_setparam>>, <<setegid>>, <<seteuid>>, <<setpgid>>, <<vfork>>. <<sched_setparam>>, <<setegid>>, <<seteuid>>, <<setpgid>>, <<vfork>>.
*/ */
@ -186,13 +186,13 @@ process_spawnattr(_CONST posix_spawnattr_t sa)
/* Set signal masks/defaults */ /* Set signal masks/defaults */
if (sa->sa_flags & POSIX_SPAWN_SETSIGMASK) { if (sa->sa_flags & POSIX_SPAWN_SETSIGMASK) {
_sigprocmask(SIG_SETMASK, &sa->sa_sigmask, NULL); sigprocmask(SIG_SETMASK, &sa->sa_sigmask, NULL);
} }
if (sa->sa_flags & POSIX_SPAWN_SETSIGDEF) { if (sa->sa_flags & POSIX_SPAWN_SETSIGDEF) {
for (i = 1; i < NSIG; i++) { for (i = 1; i < NSIG; i++) {
if (sigismember(&sa->sa_sigdefault, i)) if (sigismember(&sa->sa_sigdefault, i))
if (_sigaction(i, &sigact, NULL) != 0) if (sigaction(i, &sigact, NULL) != 0)
return (errno); return (errno);
} }
} }
@ -212,7 +212,7 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae)
if (fd < 0) if (fd < 0)
return (errno); return (errno);
if (fd != fae->fae_fildes) { if (fd != fae->fae_fildes) {
if (_dup2(fd, fae->fae_fildes) == -1) if (dup2(fd, fae->fae_fildes) == -1)
return (errno); return (errno);
if (_close(fd) != 0) { if (_close(fd) != 0) {
if (errno == EBADF) if (errno == EBADF)
@ -226,7 +226,7 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae)
break; break;
case FAE_DUP2: case FAE_DUP2:
/* Perform a dup2() */ /* Perform a dup2() */
if (_dup2(fae->fae_fildes, fae->fae_newfildes) == -1) if (dup2(fae->fae_fildes, fae->fae_newfildes) == -1)
return (errno); return (errno);
#ifdef HAVE_FCNTL #ifdef HAVE_FCNTL
if (_fcntl(fae->fae_newfildes, F_SETFD, 0) == -1) if (_fcntl(fae->fae_newfildes, F_SETFD, 0) == -1)
@ -281,14 +281,14 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
_exit(127); _exit(127);
} }
if (use_env_path) if (use_env_path)
_execvpe(path, argv, envp != NULL ? envp : *p_environ); execvpe(path, argv, envp != NULL ? envp : *p_environ);
else else
_execve(path, argv, envp != NULL ? envp : *p_environ); _execve(path, argv, envp != NULL ? envp : *p_environ);
error = errno; error = errno;
_exit(127); _exit(127);
default: default:
if (error != 0) if (error != 0)
_waitpid(p, NULL, WNOHANG); waitpid(p, NULL, WNOHANG);
else if (pid != NULL) else if (pid != NULL)
*pid = p; *pid = p;
return (error); return (error);