From c7d758c7f22b708ce17d739d351abe89529fe1c2 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Mon, 2 Dec 2013 22:07:54 +0100 Subject: [PATCH] adding include/spawn.h, removing include/sa.h Change-Id: Ieff4f5e51f98ef5105307e6b8c6ba1dd6f3c844a --- distrib/sets/lists/minix/mi | 4 ++ include/Makefile | 6 +-- include/sa.h | 51 --------------------- include/spawn.h | 89 +++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 54 deletions(-) delete mode 100644 include/sa.h create mode 100644 include/spawn.h diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 93c36f57f..aa72999d8 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -1,3 +1,4 @@ + # # Sorted using sort_set.sh in releasetools. # to add an entry simply add it at the end of the @@ -1097,6 +1098,7 @@ ./usr/include/ifaddrs.h minix-sys ./usr/include/inttypes.h minix-sys ./usr/include/iso646.h minix-sys +./usr/include/kvm.h minix-sys ./usr/include/langinfo.h minix-sys ./usr/include/lauxlib.h minix-sys ./usr/include/libelf.h minix-sys @@ -1325,6 +1327,7 @@ ./usr/include/puffs.h minix-sys ./usr/include/puffs_msgif.h minix-sys ./usr/include/pwd.h minix-sys +./usr/include/quota.h minix-sys ./usr/include/randomid.h minix-sys ./usr/include/ranlib.h minix-sys ./usr/include/readline minix-sys @@ -1348,6 +1351,7 @@ ./usr/include/sha1.h minix-sys ./usr/include/sha2.h minix-sys ./usr/include/signal.h minix-sys +./usr/include/spawn.h minix-sys ./usr/include/sqlite3ext.h minix-sys ./usr/include/sqlite3.h minix-sys ./usr/include/ssp minix-sys diff --git a/include/Makefile b/include/Makefile index fa4125d71..baaf46271 100644 --- a/include/Makefile +++ b/include/Makefile @@ -11,14 +11,14 @@ INCS= a.out.h aio.h ar.h assert.h atomic.h \ bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \ db.h dirent.h disktab.h dlfcn.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \ fstab.h fts.h ftw.h getopt.h glob.h grp.h ifaddrs.h iconv.h \ - inttypes.h iso646.h langinfo.h libgen.h \ + inttypes.h iso646.h kvm.h langinfo.h libgen.h \ limits.h link.h link_aout.h link_elf.h locale.h \ login_cap.h lwp.h malloc.h math.h md2.h \ memory.h mntopts.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h netdb.h netgroup.h nlist.h nl_types.h nsswitch.h \ - paths.h pwd.h randomid.h ranlib.h re_comp.h regex.h regexp.h \ + paths.h pwd.h quota.h randomid.h ranlib.h re_comp.h regex.h regexp.h \ resolv.h res_update.h rmt.h sched.h search.h semaphore.h setjmp.h \ - string.h sgtty.h signal.h stab.h stdbool.h stddef.h stdio.h \ + string.h sgtty.h signal.h spawn.h stab.h stdbool.h stddef.h stdio.h \ stdlib.h strings.h stringlist.h struct.h sysexits.h tar.h time.h \ ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \ utmpx.h uuid.h vis.h wchar.h wctype.h wordexp.h diff --git a/include/sa.h b/include/sa.h deleted file mode 100644 index 89700ab98..000000000 --- a/include/sa.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: sa.h,v 1.6 2008/04/28 20:22:54 martin Exp $ */ - -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Nathan Williams. - * - * 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 - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _SA_H_ -#define _SA_H_ - -#include -#include -#include -#include - - -__BEGIN_DECLS -int sa_register(sa_upcall_t, sa_upcall_t *, int, ssize_t); -int sa_stacks(int, stack_t *); -size_t sa_getstacksize(void); -int sa_enable(void); -int sa_setconcurrency(int); -int sa_yield(void); -int sa_preempt(int); -__END_DECLS - -#endif /* !_SA_H_ */ diff --git a/include/spawn.h b/include/spawn.h new file mode 100644 index 000000000..19cdc37d1 --- /dev/null +++ b/include/spawn.h @@ -0,0 +1,89 @@ +/* $NetBSD: spawn.h,v 1.4 2012/02/22 17:51:01 martin Exp $ */ + +/*- + * Copyright (c) 2008 Ed Schouten + * 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 + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/include/spawn.h,v 1.3.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $ + */ + +#ifndef _SPAWN_H +#define _SPAWN_H + +#include + +__BEGIN_DECLS +/* + * Spawn routines + * + */ +int posix_spawn(pid_t * __restrict, const char * __restrict, + const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict, + char * const *__restrict, char * const *__restrict); +int posix_spawnp(pid_t * __restrict, const char * __restrict, + const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict, + char * const *__restrict, char * const *__restrict); + +/* + * File descriptor actions + */ +int posix_spawn_file_actions_init(posix_spawn_file_actions_t *); +int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *); + +int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict, + int, const char * __restrict, int, mode_t); +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int); +int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int); + +/* + * Spawn attributes + */ +int posix_spawnattr_init(posix_spawnattr_t *); +int posix_spawnattr_destroy(posix_spawnattr_t *); + +int posix_spawnattr_getflags(const posix_spawnattr_t * __restrict, + short * __restrict); +int posix_spawnattr_getpgroup(const posix_spawnattr_t * __restrict, + pid_t * __restrict); +int posix_spawnattr_getschedparam(const posix_spawnattr_t * __restrict, + struct sched_param * __restrict); +int posix_spawnattr_getschedpolicy(const posix_spawnattr_t * __restrict, + int * __restrict); +int posix_spawnattr_getsigdefault(const posix_spawnattr_t * __restrict, + sigset_t * __restrict); +int posix_spawnattr_getsigmask(const posix_spawnattr_t * __restrict, + sigset_t * __restrict sigmask); + +int posix_spawnattr_setflags(posix_spawnattr_t *, short); +int posix_spawnattr_setpgroup(posix_spawnattr_t *, pid_t); +int posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict, + const struct sched_param * __restrict); +int posix_spawnattr_setschedpolicy(posix_spawnattr_t *, int); +int posix_spawnattr_setsigdefault(posix_spawnattr_t * __restrict, + const sigset_t * __restrict); +int posix_spawnattr_setsigmask(posix_spawnattr_t * __restrict, + const sigset_t * __restrict); +__END_DECLS + +#endif /* _SPAWN_H */