Export the common shared library search functions in its own header file.

libexec/ld.aout_so/shlib.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: shlib.c,v 1.15 1998/09/15 12:38:55 pk Exp $	*/
+/*	$NetBSD: shlib.c,v 1.16 1998/12/15 23:16:14 pk Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,6 @@ int	isdigit();
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/time.h>
-#include <a.out.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
@@ -54,8 +53,9 @@ int	isdigit();
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <link.h>
 
-#include "ld.h"
+#include "shlib.h"
 
 /*
  * Standard directories to search for files specified by -l.
@@ -75,7 +75,6 @@ char	*standard_search_dirs[] = {
 	STANDARD_SEARCH_DIRS
 };
 
-
 void
 add_search_dir(name)
 	char	*name;
@@ -324,3 +323,64 @@ int	do_dot_a;
 
 	return path;
 }
+
+
+/*
+ * Utility functions shared with others.
+ */
+
+
+/*
+ * Like malloc but get fatal error if memory is exhausted.
+ */
+void *
+xmalloc(size)
+	size_t size;
+{
+	void	*result = (void *)malloc(size);
+
+	if (!result)
+		errx(1, "virtual memory exhausted");
+
+	return (result);
+}
+
+/*
+ * Like realloc but get fatal error if memory is exhausted.
+ */
+void *
+xrealloc(ptr, size)
+	void *ptr;
+	size_t size;
+{
+	void	*result;
+
+	result = (ptr == NULL) ? malloc(size) : realloc(ptr, size);
+	if (result == NULL)
+		errx(1, "virtual memory exhausted");
+
+	return (result);
+}
+
+/*
+ * Return a newly-allocated string whose contents concatenate
+ * the strings S1, S2, S3.
+ */
+char *
+concat(s1, s2, s3)
+	const char *s1, *s2, *s3;
+{
+	int	len1 = strlen(s1),
+		len2 = strlen(s2),
+		len3 = strlen(s3);
+
+	char *result = (char *)xmalloc(len1 + len2 + len3 + 1);
+
+	strcpy(result, s1);
+	strcpy(result + len1, s2);
+	strcpy(result + len1 + len2, s3);
+	result[len1 + len2 + len3] = 0;
+
+	return (result);
+}
+

libexec/ld.aout_so/shlib.h

@@ -0,0 +1,57 @@
+/*	$NetBSD: shlib.h,v 1.1 1998/12/15 23:16:14 pk Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Kranenburg.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 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.
+ */
+
+/*
+ * Functions and data exported from shlib.c
+ */
+extern char	**search_dirs;	/* Directories to search for libraries. */
+extern int	n_search_dirs;	/* Length of above. */
+
+char		*findshlib __P((char *, int *, int *, int));
+void		add_search_dir __P((char *));
+void		add_search_path __P((char *));
+void		std_search_path __P((void));
+void		remove_search_dir __P((char *));
+void		remove_search_path __P((char *));
+int		getdewey __P((int[], char *));
+int		cmpndewey __P((int[], int, int[], int));
+
+/* XXX - Common Utility functions currently also in shlib.c */
+void		*xmalloc __P((size_t));
+void		*xrealloc __P((void *, size_t));
+char		*concat __P((const char *, const char *, const char *));