diff options
author | Elliott Hughes <enh@google.com> | 2014-09-23 14:06:56 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-09-23 14:06:56 -0700 |
commit | 49eed7db79bd2664a2a13552ad81d445c93ba462 (patch) | |
tree | 5aed7a53313e7832097542e538d829ae4c1fd34a /libc/upstream-netbsd/lib | |
parent | 93951cfa96c3c7504a78f94e7ec408936e5db9bf (diff) | |
download | bionic-49eed7db79bd2664a2a13552ad81d445c93ba462.zip bionic-49eed7db79bd2664a2a13552ad81d445c93ba462.tar.gz bionic-49eed7db79bd2664a2a13552ad81d445c93ba462.tar.bz2 |
Switch to OpenBSD insque/remque/killpg.
Change-Id: Ie02290ad3187b1c1596dd776fd1c8a743a55f7ef
Diffstat (limited to 'libc/upstream-netbsd/lib')
-rw-r--r-- | libc/upstream-netbsd/lib/libc/stdlib/insque.c | 58 | ||||
-rw-r--r-- | libc/upstream-netbsd/lib/libc/stdlib/remque.c | 53 | ||||
-rw-r--r-- | libc/upstream-netbsd/lib/libc/unistd/killpg.c | 56 |
3 files changed, 0 insertions, 167 deletions
diff --git a/libc/upstream-netbsd/lib/libc/stdlib/insque.c b/libc/upstream-netbsd/lib/libc/stdlib/insque.c deleted file mode 100644 index 09020ae..0000000 --- a/libc/upstream-netbsd/lib/libc/stdlib/insque.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 1993 John Brezak - * 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. - * 3. The name of the author may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 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. - */ - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: insque.c,v 1.3 2012/06/25 22:32:45 abs Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include <assert.h> -#include <search.h> - -struct qelem { - struct qelem *q_forw; - struct qelem *q_back; -}; - -void -insque(void *entry, void *pred) -{ - struct qelem *e = (struct qelem *) entry; - struct qelem *p = (struct qelem *) pred; - - _DIAGASSERT(e != 0); - - e->q_back = p; - if (p) { - e->q_forw = p->q_forw; - if (p->q_forw) - p->q_forw->q_back = e; - p->q_forw = e; - } else - e->q_forw = 0; -} diff --git a/libc/upstream-netbsd/lib/libc/stdlib/remque.c b/libc/upstream-netbsd/lib/libc/stdlib/remque.c deleted file mode 100644 index 6060ad8..0000000 --- a/libc/upstream-netbsd/lib/libc/stdlib/remque.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 1993 John Brezak - * 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. - * 3. The name of the author may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 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. - */ - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: remque.c,v 1.3 2012/06/25 22:32:45 abs Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include <assert.h> -#include <search.h> - -struct qelem { - struct qelem *q_forw; - struct qelem *q_back; -}; - -void -remque(void *element) -{ - struct qelem *e = (struct qelem *) element; - - _DIAGASSERT(e != 0); - - if (e->q_forw) - e->q_forw->q_back = e->q_back; - if (e->q_back) - e->q_back->q_forw = e->q_forw; -} diff --git a/libc/upstream-netbsd/lib/libc/unistd/killpg.c b/libc/upstream-netbsd/lib/libc/unistd/killpg.c deleted file mode 100644 index ceac3f4..0000000 --- a/libc/upstream-netbsd/lib/libc/unistd/killpg.c +++ /dev/null @@ -1,56 +0,0 @@ -/* $NetBSD: killpg.c,v 1.8 2003/08/07 16:42:39 agc Exp $ */ - -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)killpg.c 8.1 (Berkeley) 6/2/93"; -#else -__RCSID("$NetBSD: killpg.c,v 1.8 2003/08/07 16:42:39 agc Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include <sys/types.h> -#include <signal.h> -#include <errno.h> - -/* - * Backwards-compatible killpg(). - */ -int -killpg(pid_t pgid, int sig) -{ - if (pgid == 1) { - errno = ESRCH; - return (-1); - } - return (kill(-pgid, sig)); -} |