BSD 4_4 release

[unix-history] / usr / src / lib / libcompat / 4.3 / lsearch.c

diff --git a/usr/src/lib/libcompat/4.3/lsearch.c b/usr/src/lib/libcompat/4.3/lsearch.c
index 22bc172..baf90ed 100644 (file)
--- a/usr/src/lib/libcompat/4.3/lsearch.c
+++ b/usr/src/lib/libcompat/4.3/lsearch.c
@@ -1,31 +1,47 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Roger L. Snyder.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Roger L. Snyder.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)lsearch.c  5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)lsearch.c  8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 

-char *linear_base();
+static char *linear_base();

 
 char *
 lsearch(key, base, nelp, width, compar)
 
 char *
 lsearch(key, base, nelp, width, compar)


@@ -74,43 +90,3 @@ linear_base(key, base, nelp, width, compar, add_flag)
        bcopy(key, end, (int)width);
        return(end);
 }
        bcopy(key, end, (int)width);
        return(end);
 }

-
-char *
-rlsearch(fd, nelp, width)
-       int fd;
-       u_int *nelp, *width;
-{
-       register u_int len;
-       long val;
-       char *base, *malloc();
-
-       if (read(fd, (char *)&val, sizeof(long)) != sizeof(long))
-               return(NULL);
-       *nelp = (u_int)ntohl(val);
-       if (read(fd, (char *)&val, sizeof(long)) != sizeof(long))
-               return(NULL);
-       *width = (u_int)ntohl(val);
-
-       len = *nelp * *width;
-       if (!(base = malloc(len)))
-               return(NULL);
-       return(read(fd, base, len) == len ? base : NULL);
-}
-
-wlsearch(fd, base, nelp, width)
-       int fd;
-       char *base;
-       u_int nelp, width;
-{
-       long val;
-
-       val = htonl((long)nelp);
-       if (write(fd, (char *)&val, sizeof(long)) != sizeof(long))
-               return(-1);
-       val = htonl((long)width);
-       if (write(fd, (char *)&val, sizeof(long)) != sizeof(long))
-               return(-1);
-       if (write(fd, base, nelp * width) != nelp * width)
-               return(-1);
-       return(0);
-}