Split posix_spawn.c into 3 different files

newlib/libc/posix/posix_spawn.c

 /*-
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 73 matching lines @@
 <<_execve>>, <<execvpe>>, <<_exit>>, <<_open>>, <<sigaction>>,
 <<sigprocmask>>, <<waitpid>>, <<sched_setscheduler>>,
 <<sched_setparam>>, <<setegid>>, <<seteuid>>, <<setpgid>>, <<vfork>>.
 */
 
 #ifndef _NO_POSIX_SPAWN
 
 #include <sys/cdefs.h>
 
 #include <sys/signal.h>
-#include <sys/queue.h>
 #include <sys/wait.h>
 #include <_syslist.h>
 
 #include <errno.h>
 #include <fcntl.h>
-#include <sched.h>
 #include <spawn.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 /* Only deal with a pointer to environ, to work around subtle bugs with shared
    libraries and/or small data systems where the user declares his own
    'environ'.  */
 static char ***p_environ = &environ;
 
-struct __posix_spawnattr {
-        short                   sa_flags;
-        pid_t                   sa_pgroup;
-        struct sched_param      sa_schedparam;
-        int                     sa_schedpolicy;
-        sigset_t                sa_sigdefault;
-        sigset_t                sa_sigmask;
-};
-
-struct __posix_spawn_file_actions {
-        STAILQ_HEAD(, __posix_spawn_file_actions_entry) fa_list;
-};
-
-typedef struct __posix_spawn_file_actions_entry {
-        STAILQ_ENTRY(__posix_spawn_file_actions_entry) fae_list;
-        enum { FAE_OPEN, FAE_DUP2, FAE_CLOSE } fae_action;
-
-        int fae_fildes;
-        union {
-                struct {
-                        char *path;
-#define fae_path        fae_data.open.path
-                        int oflag;
-#define fae_oflag       fae_data.open.oflag
-                        mode_t mode;
-#define fae_mode        fae_data.open.mode
-                } open;
-                struct {
-                        int newfildes;
-#define fae_newfildes   fae_data.dup2.newfildes
-                } dup2;
-        } fae_data;
-} posix_spawn_file_actions_entry_t;
-
 /*
  * Spawn routines
  */
 
 static int
-process_spawnattr(_CONST posix_spawnattr_t sa)
+process_spawnattr(_CONST posix_spawnattr_t* sa)
 {
         struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL };
         int i;
 
         /*
          * POSIX doesn't really describe in which order everything
          * should be set. We'll just set them in the order in which they
          * are mentioned.
          */
 
@@ skipping 72 matching lines @@
                 break;
         case FAE_CLOSE:
                 /* Perform a close(), do not fail if already closed */
                 (void)_close(fae->fae_fildes);
                 break;
         }
         return (0);
 }
 
 static int
-process_file_actions(_CONST posix_spawn_file_actions_t fa)
+process_file_actions(_CONST posix_spawn_file_actions_t* fa)
 {
         posix_spawn_file_actions_entry_t *fae;
         int error;
 
         /* Replay all file descriptor modifications */
         STAILQ_FOREACH(fae, &fa->fa_list, fae_list) {
                 error = process_file_actions_entry(fae);
                 if (error)
                         return (error);
         }
         return (0);
 }
 
 static int
 do_posix_spawn(pid_t *pid, _CONST char *path,
         _CONST posix_spawn_file_actions_t *fa,
         _CONST posix_spawnattr_t *sa,
         char * _CONST argv[], char * _CONST envp[], int use_env_path)
 {
         pid_t p;
         volatile int error = 0;
 
         p = vfork();
         switch (p) {
         case -1:
                 return (errno);
         case 0:
                 if (sa != NULL) {
-                        error = process_spawnattr(*sa);
+                        error = process_spawnattr(sa);
                         if (error)
                                 _exit(127);
                 }
                 if (fa != NULL) {
-                        error = process_file_actions(*fa);
+                        error = process_file_actions(fa);
                         if (error)
                                 _exit(127);
                 }
                 if (use_env_path)
                         execvpe(path, argv, envp != NULL ? envp : *p_environ);
                 else
                         _execve(path, argv, envp != NULL ? envp : *p_environ);
                 error = errno;
                 _exit(127);
         default:
@@ skipping 22 matching lines @@
         pid_t *pid _AND
         _CONST char *path _AND
         _CONST posix_spawn_file_actions_t *fa _AND
         _CONST posix_spawnattr_t *sa _AND
         char * _CONST argv[] _AND
         char * _CONST envp[])
 {
         return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
 }
 
-/*
- * File descriptor actions
- */
-
-int
-_DEFUN(posix_spawn_file_actions_init, (ret),
-        posix_spawn_file_actions_t *ret)
-{
-        posix_spawn_file_actions_t fa;
-
-        fa = malloc(sizeof(struct __posix_spawn_file_actions));
-        if (fa == NULL)
-                return (-1);
-
-        STAILQ_INIT(&fa->fa_list);
-        *ret = fa;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawn_file_actions_destroy, (fa),
-        posix_spawn_file_actions_t *fa)
-{
-        posix_spawn_file_actions_entry_t *fae;
-
-        while ((fae = STAILQ_FIRST(&(*fa)->fa_list)) != NULL) {
-                /* Remove file action entry from the queue */
-                STAILQ_REMOVE_HEAD(&(*fa)->fa_list, fae_list);
-
-                /* Deallocate file action entry */
-                if (fae->fae_action == FAE_OPEN)
-                        free(fae->fae_path);
-                free(fae);
-        }
-
-        free(*fa);
-        return (0);
-}
-
-int
-_DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
-        posix_spawn_file_actions_t * __restrict fa _AND
-        int fildes _AND
-        _CONST char * __restrict path _AND
-        int oflag _AND
-        mode_t mode)
-{
-        posix_spawn_file_actions_entry_t *fae;
-        int error;
-
-        if (fildes < 0)
-                return (EBADF);
-
-        /* Allocate object */
-        fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-        if (fae == NULL)
-                return (errno);
-
-        /* Set values and store in queue */
-        fae->fae_action = FAE_OPEN;
-        fae->fae_path = strdup(path);
-        if (fae->fae_path == NULL) {
-                error = errno;
-                free(fae);
-                return (error);
-        }
-        fae->fae_fildes = fildes;
-        fae->fae_oflag = oflag;
-        fae->fae_mode = mode;
-
-        STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-        return (0);
-}
-
-int
-_DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
-        posix_spawn_file_actions_t *fa _AND
-        int fildes _AND
-        int newfildes)
-{
-        posix_spawn_file_actions_entry_t *fae;
-
-        if (fildes < 0 || newfildes < 0)
-                return (EBADF);
-
-        /* Allocate object */
-        fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-        if (fae == NULL)
-                return (errno);
-
-        /* Set values and store in queue */
-        fae->fae_action = FAE_DUP2;
-        fae->fae_fildes = fildes;
-        fae->fae_newfildes = newfildes;
-
-        STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-        return (0);
-}
-
-int
-_DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
-        posix_spawn_file_actions_t *fa _AND
-        int fildes)
-{
-        posix_spawn_file_actions_entry_t *fae;
-
-        if (fildes < 0)
-                return (EBADF);
-
-        /* Allocate object */
-        fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-        if (fae == NULL)
-                return (errno);
-
-        /* Set values and store in queue */
-        fae->fae_action = FAE_CLOSE;
-        fae->fae_fildes = fildes;
-
-        STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-        return (0);
-}
-
-/*
- * Spawn attributes
- */
-
-int
-_DEFUN(posix_spawnattr_init, (ret),
-        posix_spawnattr_t *ret)
-{
-        posix_spawnattr_t sa;
-
-        sa = calloc(1, sizeof(struct __posix_spawnattr));
-        if (sa == NULL)
-                return (errno);
-
-        /* Set defaults as specified by POSIX, cleared above */
-        *ret = sa;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_destroy, (sa),
-        posix_spawnattr_t *sa)
-{
-        free(*sa);
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getflags, (sa, flags),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        short * __restrict flags)
-{
-        *flags = (*sa)->sa_flags;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        pid_t * __restrict pgroup)
-{
-        *pgroup = (*sa)->sa_pgroup;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        struct sched_param * __restrict schedparam)
-{
-        *schedparam = (*sa)->sa_schedparam;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        int * __restrict schedpolicy)
-{
-        *schedpolicy = (*sa)->sa_schedpolicy;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        sigset_t * __restrict sigdefault)
-{
-        *sigdefault = (*sa)->sa_sigdefault;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
-        _CONST posix_spawnattr_t * __restrict sa _AND
-        sigset_t * __restrict sigmask)
-{
-        *sigmask = (*sa)->sa_sigmask;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setflags, (sa, flags),
-        posix_spawnattr_t *sa _AND
-        short flags)
-{
-        (*sa)->sa_flags = flags;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
-        posix_spawnattr_t *sa _AND
-        pid_t pgroup)
-{
-        (*sa)->sa_pgroup = pgroup;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
-        posix_spawnattr_t * __restrict sa _AND
-        _CONST struct sched_param * __restrict schedparam)
-{
-        (*sa)->sa_schedparam = *schedparam;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
-        posix_spawnattr_t *sa _AND
-        int schedpolicy)
-{
-        (*sa)->sa_schedpolicy = schedpolicy;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
-        posix_spawnattr_t * __restrict sa _AND
-        _CONST sigset_t * __restrict sigdefault)
-{
-        (*sa)->sa_sigdefault = *sigdefault;
-        return (0);
-}
-
-int
-_DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
-        posix_spawnattr_t * __restrict sa _AND
-        _CONST sigset_t * __restrict sigmask)
-{
-        (*sa)->sa_sigmask = *sigmask;
-        return (0);
-}
-
 #endif  /* !_NO_POSIX_SPAWN */