From d1a476799c9bdc18cecfe44be7989ccaf4471da5 Mon Sep 17 00:00:00 2001 From: millert <> Date: Thu, 8 May 2003 23:26:30 +0000 Subject: [PATCH] move insque(3) and remque(3) from libcompat -> libc; they are now POSIX --- src/lib/libc/stdlib/Makefile.inc | 17 +++--- src/lib/libc/stdlib/insque.3 | 100 +++++++++++++++++++++++++++++++ src/lib/libc/stdlib/insque.c | 52 ++++++++++++++++ src/lib/libc/stdlib/remque.c | 48 +++++++++++++++ 4 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 src/lib/libc/stdlib/insque.3 create mode 100644 src/lib/libc/stdlib/insque.c create mode 100644 src/lib/libc/stdlib/remque.c diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc index d2034982..64039263 100644 --- a/src/lib/libc/stdlib/Makefile.inc +++ b/src/lib/libc/stdlib/Makefile.inc @@ -5,11 +5,11 @@ SRCS+= a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \ calloc.c cfree.c exit.c ecvt.c gcvt.c getenv.c getopt.c getopt_long.c \ - getsubopt.c heapsort.c l64a.c lsearch.c malloc.c merge.c multibyte.c \ - putenv.c qsort.c radixsort.c rand.c random.c realpath.c setenv.c \ - strtod.c strtol.c strtoll.c strtoul.c strtoull.c system.c tfind.c \ - tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \ - mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c + getsubopt.c heapsort.c insque.c l64a.c lsearch.c malloc.c merge.c \ + multibyte.c putenv.c qsort.c radixsort.c rand.c random.c realpath.c \ + setenv.c strtod.c strtol.c strtoll.c strtoul.c strtoull.c system.c \ + tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \ + lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c .if (${MACHINE_ARCH} == "m68k") SRCS+= abs.S div.c labs.c ldiv.c @@ -34,13 +34,14 @@ SRCS+= abs.c div.c labs.c ldiv.c MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \ bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \ - getsubopt.3 labs.3 ldiv.3 lsearch.3 malloc.3 memory.3 qabs.3 qdiv.3 \ - qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 strtod.3 \ - strtol.3 strtoul.3 system.3 tsearch.3 + getsubopt.3 insque.3 labs.3 ldiv.3 lsearch.3 malloc.3 memory.3 qabs.3 \ + qdiv.3 qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \ + strtod.3 strtol.3 strtoul.3 system.3 tsearch.3 MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3 MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3 MLINKS+=getopt_long.3 getopt_long_only.3 +MLINKS+=insque.3 remque.3 MLINKS+=lsearch.3 lfind.3 MLINKS+=malloc.3 free.3 malloc.3 realloc.3 malloc.3 calloc.3 MLINKS+=malloc.3 cfree.3 malloc.3 malloc.conf.5 diff --git a/src/lib/libc/stdlib/insque.3 b/src/lib/libc/stdlib/insque.3 new file mode 100644 index 00000000..b87adb87 --- /dev/null +++ b/src/lib/libc/stdlib/insque.3 @@ -0,0 +1,100 @@ +.\" $OpenBSD: insque.3,v 1.1 2003/05/08 23:26:30 millert Exp $ +.\" 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. +.\" +.\" +.Dd August 12, 1993 +.Dt INSQUE 3 +.Os +.Sh NAME +.Nm insque , +.Nm remque +.Nd insert/remove element from a queue +.Sh SYNOPSIS +.Fd #include +.Ft void +.Fn insque "void *elem" "void *pred" +.Ft void +.Fn remque "void *elem" +.Sh DESCRIPTION +.Bf -symbolic +These interfaces have been superceded by the +.Xr queue 3 +macros and are provided for compatibility with legacy code. +.Ef +.Pp +.Fn insque +and +.Fn remque +manipulate queues built from doubly linked lists. +The queue can be either circular or linear. +Each element in the queue must be of the following form: +.Bd -literal +struct qelem { + struct qelem *q_forw; + struct qelem *q_back; + char q_data[]; +}; +.Ed +.Pp +The first two elements in the struct must be pointers of the +same type that point to the previous and next elements in +the queue respectively. +Any subsequent data in the struct is application-dependent. +.Pp +The +.Fn insque +function inserts +.Fa elem +into a queue immediately after +.Fa pred . +.Pp +The +.Fn remque +function removes +.Fa elem +from the queue. +.Sh DIAGNOSTICS +These functions are not atomic unless that machine architecture allows it. +.Sh SEE ALSO +.Xr queue 3 +.Sh STANDARDS +The +.Fn lsearch +and +.Fn lfind +functions conform to the +.St -p1003.1-01 +and +.St -xpg4.3 . +specifications. +.Sh HISTORY +The +.Fn insque +and +.Fn remque +functions are derived from the insque and remque instructions on a +.Tn VAX . diff --git a/src/lib/libc/stdlib/insque.c b/src/lib/libc/stdlib/insque.c new file mode 100644 index 00000000..549246c7 --- /dev/null +++ b/src/lib/libc/stdlib/insque.c @@ -0,0 +1,52 @@ +/* $OpenBSD: insque.c,v 1.1 2003/05/08 23:26:30 millert Exp $ */ + +/* + * 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char *rcsid = "$OpenBSD: insque.c,v 1.1 2003/05/08 23:26:30 millert Exp $"; +#endif /* LIBC_SCCS and not lint */ + +#include + +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; + + e->q_forw = p->q_forw; + e->q_back = p; + p->q_forw->q_back = e; + p->q_forw = e; +} diff --git a/src/lib/libc/stdlib/remque.c b/src/lib/libc/stdlib/remque.c new file mode 100644 index 00000000..f4c5769a --- /dev/null +++ b/src/lib/libc/stdlib/remque.c @@ -0,0 +1,48 @@ +/* $OpenBSD: remque.c,v 1.1 2003/05/08 23:26:30 millert Exp $ */ + +/* + * 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char *rcsid = "$OpenBSD: remque.c,v 1.1 2003/05/08 23:26:30 millert Exp $"; +#endif /* LIBC_SCCS and not lint */ + +#include + +struct qelem { + struct qelem *q_forw; + struct qelem *q_back; +}; + +void +remque(void *element) +{ + struct qelem *e = (struct qelem *) element; + e->q_forw->q_back = e->q_back; + e->q_back->q_forw = e->q_forw; +}